You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/08/09 12:51:43 UTC

[camel] branch master updated: CAMEL-13839: replace all NO-BREAK SPACE with SPACE

This is an automated email from the ASF dual-hosted git repository.

zregvart 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 21b774a  CAMEL-13839: replace all NO-BREAK SPACE with SPACE
21b774a is described below

commit 21b774a2c9d6799811c134aed89b260f863eeedc
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Aug 9 14:19:07 2019 +0200

    CAMEL-13839: replace all NO-BREAK SPACE with SPACE
    
    This replaces all NO-BREAK SPACE characters (UTF-8: 0xC2 0xA0) with
    regular dull old space character (UTF-8: 0x20). This should help with
    the URLs that lead with NO-BREAK SPACE being detected as URLs and render
    properly by Asciidoctor.
---
 .../src/main/docs/ahc-ws-component.adoc            |  12 +-
 .../camel-ahc/src/main/docs/ahc-component.adoc     |   4 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |  22 +-
 .../camel-apns/src/main/docs/apns-component.adoc   |   4 +-
 .../src/main/docs/as2-component.adoc               |  28 +-
 .../main/docs/atmosphere-websocket-component.adoc  |  10 +-
 .../camel-avro/src/main/docs/avro-component.adoc   |  10 +-
 .../src/main/docs/aws-cw-component.adoc            |   2 +-
 .../src/main/docs/aws-ddbstream-component.adoc     |  12 +-
 .../src/main/docs/aws-kinesis-component.adoc       |   6 +-
 .../main/docs/aws-kinesis-firehose-component.adoc  |   6 +-
 .../src/main/docs/aws-sns-component.adoc           |   2 +-
 .../src/main/docs/aws-swf-component.adoc           |   6 +-
 components/camel-azure/src/main/docs/azure.adoc    |   2 +-
 .../src/main/docs/barcode-dataformat.adoc          |   4 +-
 .../src/main/docs/bean-validator-component.adoc    |   4 +-
 .../camel-bean/src/main/docs/bean-language.adoc    |   4 +-
 .../src/main/docs/beanstalk-component.adoc         |  38 +--
 .../src/main/docs/bindy-dataformat.adoc            |   8 +-
 .../src/main/docs/box-component.adoc               |  74 +++---
 .../src/main/docs/braintree-component.adoc         | 292 ++++++++++-----------
 .../src/main/docs/caffeine-cache-component.adoc    |   6 +-
 .../main/docs/caffeine-loadcache-component.adoc    |   6 +-
 .../src/main/docs/cql-component.adoc               |   6 +-
 .../camel-cbor/src/main/docs/cbor-dataformat.adoc  |   6 +-
 components/camel-cdi/src/main/docs/cdi.adoc        | 132 +++++-----
 .../camel-chunk/src/main/docs/chunk-component.adoc |  22 +-
 .../src/main/docs/cm-sms-component.adoc            |   8 +-
 .../camel-coap/src/main/docs/coap-component.adoc   |   8 +-
 .../src/main/docs/cometd-component.adoc            |   6 +-
 .../camel-crypto/src/main/docs/pgp-dataformat.adoc |  10 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc     |  20 +-
 .../camel-cxf/src/main/docs/cxfrs-component.adoc   |  22 +-
 .../src/main/docs/dataset-component.adoc           |  14 +-
 .../src/main/docs/docker-component.adoc            |   2 +-
 .../camel-dozer/src/main/docs/dozer-component.adoc |  48 ++--
 .../src/main/docs/dropbox-component.adoc           |  10 +-
 .../src/main/docs/ehcache-component.adoc           |  14 +-
 .../main/docs/elasticsearch-rest-component.adoc    |   6 +-
 .../camel-elsql/src/main/docs/elsql-component.adoc |  16 +-
 .../src/main/docs/facebook-component.adoc          |   4 +-
 .../camel-file/src/main/docs/file-component.adoc   |  12 +-
 .../camel-flink/src/main/docs/flink-component.adoc |   4 +-
 .../camel-fop/src/main/docs/fop-component.adoc     |   2 +-
 .../camel-ftp/src/main/docs/ftp-component.adoc     |   6 +-
 .../src/main/docs/ganglia-component.adoc           |  16 +-
 .../camel-git/src/main/docs/git-component.adoc     |   2 +-
 .../src/main/docs/github-component.adoc            |   6 +-
 .../src/main/docs/google-bigquery-component.adoc   |   2 +-
 .../main/docs/google-bigquery-sql-component.adoc   |   2 +-
 .../src/main/docs/google-calendar-component.adoc   |  16 +-
 .../docs/google-calendar-stream-component.adoc     |  16 +-
 .../src/main/docs/google-drive-component.adoc      |  10 +-
 .../src/main/docs/google-mail-component.adoc       |  18 +-
 .../main/docs/google-mail-stream-component.adoc    |  16 +-
 .../src/main/docs/google-pubsub-component.adoc     |   2 +-
 .../src/main/docs/google-sheets-component.adoc     |  18 +-
 .../main/docs/google-sheets-stream-component.adoc  |  16 +-
 .../camel-gora/src/main/docs/gora-component.adoc   |  24 +-
 .../camel-grape/src/main/docs/grape-component.adoc |  36 +--
 .../src/main/docs/groovy-language.adoc             |   4 +-
 .../src/main/docs/hazelcast-list-component.adoc    |   2 +-
 .../docs/hazelcast-replicatedmap-component.adoc    |   8 +-
 .../main/docs/hazelcast-ringbuffer-component.adoc  |   6 +-
 .../src/main/docs/hazelcast-topic-component.adoc   |   2 +-
 .../camel-hazelcast/src/main/docs/hazelcast.adoc   |   6 +-
 .../camel-hdfs/src/main/docs/hdfs-component.adoc   |   4 +-
 .../src/main/docs/hipchat-component.adoc           |  10 +-
 .../camel-hl7/src/main/docs/hl7-dataformat.adoc    |  16 +-
 .../src/main/docs/hl7terser-language.adoc          |   2 +-
 .../camel-http/src/main/docs/http-component.adoc   |   6 +-
 .../camel-irc/src/main/docs/irc-component.adoc     |   4 +-
 .../src/main/docs/jacksonxml-dataformat.adoc       |  54 ++--
 components/camel-jasypt/src/main/docs/jasypt.adoc  |  16 +-
 .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc  |   8 +-
 .../camel-jbpm/src/main/docs/jbpm-component.adoc   |   2 +-
 .../camel-jcr/src/main/docs/jcr-component.adoc     |   2 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  10 +-
 .../src/main/docs/jgroups-raft-component.adoc      |   8 +-
 .../src/main/docs/jgroups-component.adoc           |  12 +-
 .../camel-jira/src/main/docs/jira-component.adoc   |  12 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |  20 +-
 .../camel-jolt/src/main/docs/jolt-component.adoc   |  14 +-
 .../camel-jpa/src/main/docs/jpa-component.adoc     |   4 +-
 .../camel-jsch/src/main/docs/scp-component.adoc    |   2 +-
 .../src/main/docs/jsonpath-language.adoc           |   8 +-
 .../camel-kafka/src/main/docs/kafka-component.adoc |   4 +-
 .../docs/kubernetes-config-maps-component.adoc     |   2 +-
 .../docs/kubernetes-deployments-component.adoc     |   2 +-
 .../src/main/docs/kubernetes-hpa-component.adoc    |   2 +-
 .../src/main/docs/kubernetes-job-component.adoc    |   2 +-
 .../main/docs/kubernetes-namespaces-component.adoc |   2 +-
 .../src/main/docs/kubernetes-nodes-component.adoc  |   2 +-
 ...rnetes-persistent-volumes-claims-component.adoc |   2 +-
 .../kubernetes-persistent-volumes-component.adoc   |   2 +-
 .../src/main/docs/kubernetes-pods-component.adoc   |   2 +-
 ...bernetes-replication-controllers-component.adoc |   2 +-
 .../docs/kubernetes-resources-quota-component.adoc |   2 +-
 .../main/docs/kubernetes-secrets-component.adoc    |   2 +-
 .../kubernetes-service-accounts-component.adoc     |   2 +-
 .../main/docs/kubernetes-services-component.adoc   |   2 +-
 .../camel-kubernetes/src/main/docs/kubernetes.adoc |   4 +-
 .../docs/openshift-build-configs-component.adoc    |   2 +-
 .../src/main/docs/openshift-builds-component.adoc  |   2 +-
 components/camel-kura/src/main/docs/kura.adoc      |  26 +-
 .../camel-ldap/src/main/docs/ldap-component.adoc   |   2 +-
 .../src/main/docs/linkedin-component.adoc          |  82 +++---
 .../camel-log/src/main/docs/log-component.adoc     |  18 +-
 .../camel-lzf/src/main/docs/lzf-dataformat.adoc    |  14 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |   8 +-
 .../src/main/docs/mime-multipart-dataformat.adoc   |   2 +-
 .../src/main/docs/metrics-component.adoc           |  56 ++--
 .../src/main/docs/micrometer-component.adoc        |  48 ++--
 .../camel-mllp/src/main/docs/mllp-component.adoc   |  58 ++--
 .../src/main/docs/mongodb-gridfs-component.adoc    |   8 +-
 .../src/main/docs/mongodb-component.adoc           |  10 +-
 .../src/main/docs/mybatis-component.adoc           |   6 +-
 .../camel-nats/src/main/docs/nats-component.adoc   |   8 +-
 .../src/main/docs/netty-http-component.adoc        |  10 +-
 .../camel-netty/src/main/docs/netty-component.adoc |   6 +-
 .../camel-nsq/src/main/docs/nsq-component.adoc     |   6 +-
 .../src/main/docs/olingo2-component.adoc           |  68 ++---
 .../src/main/docs/olingo4-component.adoc           |  56 ++--
 .../camel-openstack/src/main/docs/openstack.adoc   |   2 +-
 .../src/main/docs/opentracing.adoc                 |   4 +-
 .../src/main/docs/optaplanner-component.adoc       |   2 +-
 .../camel-paho/src/main/docs/paho-component.adoc   |   6 +-
 .../camel-pdf/src/main/docs/pdf-component.adoc     |   4 +-
 .../src/main/docs/properties-component.adoc        |  24 +-
 .../src/main/docs/pulsar-component.adoc            |   2 +-
 .../src/main/docs/quickfix-component.adoc          |   2 +-
 .../src/main/docs/rabbitmq-component.adoc          |   2 +-
 .../camel-rest/src/main/docs/rest-component.adoc   |   8 +-
 .../src/main/docs/restlet-component.adoc           |   2 +-
 .../camel-saxon/src/main/docs/xquery-language.adoc |   2 +-
 .../src/main/docs/scheduler-component.adoc         |  14 +-
 .../src/main/docs/schematron-component.adoc        |  12 +-
 .../src/main/docs/servicenow-component.adoc        |   4 +-
 .../camel-slack/src/main/docs/slack-component.adoc |   6 +-
 .../camel-smpp/src/main/docs/smpp-component.adoc   |  66 ++---
 .../src/main/docs/yaml-snakeyaml-dataformat.adoc   |  18 +-
 .../src/main/docs/spark-rest-component.adoc        |   6 +-
 .../camel-spark/src/main/docs/spark-component.adoc |  60 ++---
 .../src/main/docs/splunk-component.adoc            |   4 +-
 .../src/main/docs/spring-boot.adoc                 |  64 ++---
 .../src/main/docs/spring-cloud-netflix.adoc        |   2 +-
 .../src/main/docs/spring-cloud.adoc                |   2 +-
 .../src/main/docs/spring-redis-component.adoc      |   2 +-
 components/camel-spring/src/main/docs/spring.adoc  |   4 +-
 .../camel-sql/src/main/docs/sql-component.adoc     |  34 +--
 .../src/main/docs/sql-stored-component.adoc        |   4 +-
 .../src/main/docs/swagger-java.adoc                |  18 +-
 .../src/main/docs/syslog-dataformat.adoc           |  12 +-
 .../src/main/docs/tarfile-dataformat.adoc          |  10 +-
 .../src/main/docs/test-blueprint.adoc              |  16 +-
 .../camel-timer/src/main/docs/timer-component.adoc |   2 +-
 .../src/main/docs/twilio-component.adoc            |   8 +-
 .../src/main/docs/undertow-component.adoc          |   2 +-
 .../src/main/docs/univocity-csv-dataformat.adoc    |  14 +-
 .../src/main/docs/univocity-fixed-dataformat.adoc  |  14 +-
 .../src/main/docs/univocity-tsv-dataformat.adoc    |  14 +-
 .../src/main/docs/validator-component.adoc         |   2 +-
 .../src/main/docs/velocity-component.adoc          |   4 +-
 .../src/main/docs/weather-component.adoc           |   2 +-
 .../src/main/docs/websocket-component.adoc         |   6 +-
 .../src/main/docs/xmlsecurity-component.adoc       |  68 ++---
 .../camel-xmpp/src/main/docs/xmpp-component.adoc   |   2 +-
 .../camel-xslt/src/main/docs/xslt-component.adoc   |  12 +-
 .../src/main/docs/json-xstream-dataformat.adoc     |   4 +-
 .../src/main/docs/xstream-dataformat.adoc          |   8 +-
 .../src/main/docs/zendesk-component.adoc           |   2 +-
 .../src/main/docs/gzipdeflater-dataformat.adoc     |   4 +-
 .../src/main/docs/zipdeflater-dataformat.adoc      |   6 +-
 .../src/main/docs/zipfile-dataformat.adoc          |   8 +-
 components/camel-zipkin/src/main/docs/zipkin.adoc  |  20 +-
 components/readme.adoc                             |   2 +-
 core/camel-base/src/main/docs/simple-language.adoc |   4 +-
 .../src/main/docs/tokenize-language.adoc           |   6 +-
 .../src/main/docs/eips/aggregate-eip.adoc          |  34 +--
 .../main/docs/eips/eventDrivenConsumer-eip.adoc    |   8 +-
 .../src/main/docs/eips/rollback-eip.adoc           |  12 +-
 core/camel-core/src/main/docs/eips/toD-eip.adoc    |  20 +-
 .../camel-core/src/main/docs/eips/wireTap-eip.adoc |  12 +-
 .../src/main/docs/xtokenize-language.adoc          |   2 +-
 docs/components/modules/ROOT/nav.adoc              |   2 -
 .../modules/ROOT/pages/ahc-component.adoc          |   4 +-
 .../modules/ROOT/pages/ahc-ws-component.adoc       |  12 +-
 .../modules/ROOT/pages/amqp-component.adoc         |  22 +-
 .../modules/ROOT/pages/apns-component.adoc         |   4 +-
 .../modules/ROOT/pages/as2-component.adoc          |  28 +-
 .../ROOT/pages/atmosphere-websocket-component.adoc |  10 +-
 .../modules/ROOT/pages/avro-component.adoc         |  10 +-
 .../modules/ROOT/pages/aws-cw-component.adoc       |   2 +-
 .../ROOT/pages/aws-ddbstream-component.adoc        |  12 +-
 .../modules/ROOT/pages/aws-kinesis-component.adoc  |   6 +-
 .../ROOT/pages/aws-kinesis-firehose-component.adoc |   6 +-
 .../modules/ROOT/pages/aws-sns-component.adoc      |   2 +-
 .../modules/ROOT/pages/aws-swf-component.adoc      |   6 +-
 docs/components/modules/ROOT/pages/azure.adoc      |   2 +-
 .../modules/ROOT/pages/barcode-dataformat.adoc     |   4 +-
 .../modules/ROOT/pages/bean-language.adoc          |   4 +-
 .../ROOT/pages/bean-validator-component.adoc       |   4 +-
 .../modules/ROOT/pages/beanstalk-component.adoc    |  38 +--
 .../modules/ROOT/pages/bindy-dataformat.adoc       |   8 +-
 .../modules/ROOT/pages/box-component.adoc          |  74 +++---
 .../modules/ROOT/pages/braintree-component.adoc    | 292 ++++++++++-----------
 .../ROOT/pages/caffeine-cache-component.adoc       |   6 +-
 .../ROOT/pages/caffeine-loadcache-component.adoc   |   6 +-
 .../modules/ROOT/pages/cbor-dataformat.adoc        |   6 +-
 docs/components/modules/ROOT/pages/cdi.adoc        | 132 +++++-----
 .../modules/ROOT/pages/chunk-component.adoc        |  22 +-
 .../modules/ROOT/pages/cm-sms-component.adoc       |   8 +-
 .../modules/ROOT/pages/coap-component.adoc         |   8 +-
 .../modules/ROOT/pages/cometd-component.adoc       |   6 +-
 .../modules/ROOT/pages/cql-component.adoc          |   6 +-
 .../modules/ROOT/pages/cxf-component.adoc          |  20 +-
 .../modules/ROOT/pages/cxfrs-component.adoc        |  22 +-
 .../modules/ROOT/pages/dataset-component.adoc      |  14 +-
 .../modules/ROOT/pages/docker-component.adoc       |   2 +-
 .../modules/ROOT/pages/dozer-component.adoc        |  48 ++--
 .../modules/ROOT/pages/dropbox-component.adoc      |  10 +-
 .../modules/ROOT/pages/ehcache-component.adoc      |  14 +-
 .../ROOT/pages/elasticsearch-rest-component.adoc   |   6 +-
 .../modules/ROOT/pages/elsql-component.adoc        |  16 +-
 .../modules/ROOT/pages/facebook-component.adoc     |   4 +-
 .../modules/ROOT/pages/file-component.adoc         |  12 +-
 .../modules/ROOT/pages/flink-component.adoc        |   4 +-
 .../modules/ROOT/pages/fop-component.adoc          |   2 +-
 .../modules/ROOT/pages/ftp-component.adoc          |   6 +-
 .../modules/ROOT/pages/ganglia-component.adoc      |  16 +-
 .../modules/ROOT/pages/git-component.adoc          |   2 +-
 .../modules/ROOT/pages/github-component.adoc       |   6 +-
 .../ROOT/pages/google-bigquery-component.adoc      |   2 +-
 .../ROOT/pages/google-bigquery-sql-component.adoc  |   2 +-
 .../ROOT/pages/google-calendar-component.adoc      |  16 +-
 .../pages/google-calendar-stream-component.adoc    |  16 +-
 .../modules/ROOT/pages/google-drive-component.adoc |  10 +-
 .../modules/ROOT/pages/google-mail-component.adoc  |  18 +-
 .../ROOT/pages/google-mail-stream-component.adoc   |  16 +-
 .../ROOT/pages/google-pubsub-component.adoc        |   2 +-
 .../ROOT/pages/google-sheets-component.adoc        |  18 +-
 .../ROOT/pages/google-sheets-stream-component.adoc |  16 +-
 .../modules/ROOT/pages/gora-component.adoc         |  24 +-
 .../modules/ROOT/pages/grape-component.adoc        |  36 +--
 .../modules/ROOT/pages/groovy-language.adoc        |   4 +-
 .../ROOT/pages/gzipdeflater-dataformat.adoc        |   4 +-
 .../ROOT/pages/hazelcast-list-component.adoc       |   2 +-
 .../pages/hazelcast-replicatedmap-component.adoc   |   8 +-
 .../ROOT/pages/hazelcast-ringbuffer-component.adoc |   6 +-
 .../ROOT/pages/hazelcast-topic-component.adoc      |   2 +-
 docs/components/modules/ROOT/pages/hazelcast.adoc  |   6 +-
 .../modules/ROOT/pages/hdfs-component.adoc         |   4 +-
 .../modules/ROOT/pages/hipchat-component.adoc      |  10 +-
 .../modules/ROOT/pages/hl7-dataformat.adoc         |  16 +-
 .../modules/ROOT/pages/hl7terser-language.adoc     |   2 +-
 .../modules/ROOT/pages/http-component.adoc         |   6 +-
 .../modules/ROOT/pages/irc-component.adoc          |   4 +-
 .../modules/ROOT/pages/jacksonxml-dataformat.adoc  |  54 ++--
 docs/components/modules/ROOT/pages/jasypt.adoc     |  16 +-
 .../modules/ROOT/pages/jaxb-dataformat.adoc        |   8 +-
 .../modules/ROOT/pages/jbpm-component.adoc         |   2 +-
 .../modules/ROOT/pages/jcr-component.adoc          |   2 +-
 .../modules/ROOT/pages/jetty-component.adoc        |  10 +-
 .../modules/ROOT/pages/jgroups-component.adoc      |  12 +-
 .../modules/ROOT/pages/jgroups-raft-component.adoc |   8 +-
 .../modules/ROOT/pages/jira-component.adoc         |  12 +-
 .../modules/ROOT/pages/jms-component.adoc          |  20 +-
 .../modules/ROOT/pages/jolt-component.adoc         |  14 +-
 .../modules/ROOT/pages/jpa-component.adoc          |   4 +-
 .../ROOT/pages/json-xstream-dataformat.adoc        |   4 +-
 .../modules/ROOT/pages/jsonpath-language.adoc      |   8 +-
 .../modules/ROOT/pages/kafka-component.adoc        |   4 +-
 .../pages/kubernetes-config-maps-component.adoc    |   2 +-
 .../pages/kubernetes-deployments-component.adoc    |   2 +-
 .../ROOT/pages/kubernetes-hpa-component.adoc       |   2 +-
 .../ROOT/pages/kubernetes-job-component.adoc       |   2 +-
 .../pages/kubernetes-namespaces-component.adoc     |   2 +-
 .../ROOT/pages/kubernetes-nodes-component.adoc     |   2 +-
 ...rnetes-persistent-volumes-claims-component.adoc |   2 +-
 .../kubernetes-persistent-volumes-component.adoc   |   2 +-
 .../ROOT/pages/kubernetes-pods-component.adoc      |   2 +-
 ...bernetes-replication-controllers-component.adoc |   2 +-
 .../kubernetes-resources-quota-component.adoc      |   2 +-
 .../ROOT/pages/kubernetes-secrets-component.adoc   |   2 +-
 .../kubernetes-service-accounts-component.adoc     |   2 +-
 .../ROOT/pages/kubernetes-services-component.adoc  |   2 +-
 docs/components/modules/ROOT/pages/kubernetes.adoc |   4 +-
 docs/components/modules/ROOT/pages/kura.adoc       |  26 +-
 .../modules/ROOT/pages/ldap-component.adoc         |   2 +-
 .../modules/ROOT/pages/linkedin-component.adoc     |  82 +++---
 .../modules/ROOT/pages/log-component.adoc          |  18 +-
 .../modules/ROOT/pages/lzf-dataformat.adoc         |  14 +-
 .../modules/ROOT/pages/mail-component.adoc         |   8 +-
 .../modules/ROOT/pages/metrics-component.adoc      |  56 ++--
 .../modules/ROOT/pages/micrometer-component.adoc   |  48 ++--
 .../ROOT/pages/mime-multipart-dataformat.adoc      |   2 +-
 .../modules/ROOT/pages/mllp-component.adoc         |  58 ++--
 .../modules/ROOT/pages/mongodb-component.adoc      |  10 +-
 .../ROOT/pages/mongodb-gridfs-component.adoc       |   8 +-
 .../modules/ROOT/pages/mybatis-component.adoc      |   6 +-
 .../modules/ROOT/pages/nats-component.adoc         |   8 +-
 .../modules/ROOT/pages/netty-component.adoc        |   6 +-
 .../modules/ROOT/pages/netty-http-component.adoc   |  10 +-
 .../modules/ROOT/pages/nsq-component.adoc          |   6 +-
 .../modules/ROOT/pages/olingo2-component.adoc      |  68 ++---
 .../modules/ROOT/pages/olingo4-component.adoc      |  56 ++--
 .../pages/openshift-build-configs-component.adoc   |   2 +-
 .../ROOT/pages/openshift-builds-component.adoc     |   2 +-
 docs/components/modules/ROOT/pages/openstack.adoc  |   2 +-
 .../components/modules/ROOT/pages/opentracing.adoc |   4 +-
 .../modules/ROOT/pages/optaplanner-component.adoc  |   2 +-
 .../modules/ROOT/pages/paho-component.adoc         |   6 +-
 .../modules/ROOT/pages/pdf-component.adoc          |   4 +-
 .../modules/ROOT/pages/pgp-dataformat.adoc         |  10 +-
 .../modules/ROOT/pages/properties-component.adoc   |  24 +-
 .../modules/ROOT/pages/pulsar-component.adoc       |   2 +-
 .../modules/ROOT/pages/quickfix-component.adoc     |   2 +-
 .../modules/ROOT/pages/rabbitmq-component.adoc     |   2 +-
 .../modules/ROOT/pages/rest-component.adoc         |   8 +-
 .../modules/ROOT/pages/restlet-component.adoc      |   2 +-
 .../modules/ROOT/pages/scheduler-component.adoc    |  14 +-
 .../modules/ROOT/pages/schematron-component.adoc   |  12 +-
 .../modules/ROOT/pages/scp-component.adoc          |   2 +-
 .../modules/ROOT/pages/servicenow-component.adoc   |   4 +-
 .../modules/ROOT/pages/slack-component.adoc        |   6 +-
 .../modules/ROOT/pages/smpp-component.adoc         |  66 ++---
 .../modules/ROOT/pages/spark-component.adoc        |  60 ++---
 .../modules/ROOT/pages/spark-rest-component.adoc   |   6 +-
 .../modules/ROOT/pages/splunk-component.adoc       |   4 +-
 .../components/modules/ROOT/pages/spring-boot.adoc |  64 ++---
 .../modules/ROOT/pages/spring-cloud-netflix.adoc   |   2 +-
 .../modules/ROOT/pages/spring-cloud.adoc           |   2 +-
 .../modules/ROOT/pages/spring-redis-component.adoc |   2 +-
 docs/components/modules/ROOT/pages/spring.adoc     |   4 +-
 .../modules/ROOT/pages/sql-component.adoc          |  34 +--
 .../modules/ROOT/pages/sql-stored-component.adoc   |   4 +-
 .../modules/ROOT/pages/swagger-java.adoc           |  18 +-
 .../modules/ROOT/pages/syslog-dataformat.adoc      |  12 +-
 .../modules/ROOT/pages/tarfile-dataformat.adoc     |  10 +-
 .../modules/ROOT/pages/telegram-component.adoc     |   8 +-
 .../modules/ROOT/pages/test-blueprint.adoc         |  16 +-
 .../modules/ROOT/pages/timer-component.adoc        |   2 +-
 .../modules/ROOT/pages/twilio-component.adoc       |   8 +-
 .../pages/twitter-directmessage-component.adoc     |  17 +-
 .../ROOT/pages/twitter-search-component.adoc       |  17 +-
 .../ROOT/pages/twitter-streaming-component.adoc    | 141 ----------
 .../ROOT/pages/twitter-timeline-component.adoc     |  17 +-
 docs/components/modules/ROOT/pages/twitter.adoc    | 149 -----------
 .../modules/ROOT/pages/undertow-component.adoc     |   2 +-
 .../ROOT/pages/univocity-csv-dataformat.adoc       |  14 +-
 .../ROOT/pages/univocity-fixed-dataformat.adoc     |  14 +-
 .../ROOT/pages/univocity-tsv-dataformat.adoc       |  14 +-
 .../modules/ROOT/pages/validator-component.adoc    |   2 +-
 .../modules/ROOT/pages/velocity-component.adoc     |   4 +-
 .../modules/ROOT/pages/weather-component.adoc      |   2 +-
 .../modules/ROOT/pages/websocket-component.adoc    |   6 +-
 .../modules/ROOT/pages/xmlsecurity-component.adoc  |  68 ++---
 .../modules/ROOT/pages/xmpp-component.adoc         |   2 +-
 .../modules/ROOT/pages/xquery-language.adoc        |   2 +-
 .../modules/ROOT/pages/xslt-component.adoc         |  12 +-
 .../modules/ROOT/pages/xstream-dataformat.adoc     |   8 +-
 .../ROOT/pages/yaml-snakeyaml-dataformat.adoc      |  18 +-
 .../modules/ROOT/pages/zendesk-component.adoc      |   2 +-
 .../modules/ROOT/pages/zipdeflater-dataformat.adoc |   6 +-
 .../modules/ROOT/pages/zipfile-dataformat.adoc     |   8 +-
 docs/components/modules/ROOT/pages/zipkin.adoc     |  20 +-
 .../modules/ROOT/pages/aggregate-eip.adoc          |  34 +--
 .../modules/ROOT/pages/bean-binding.adoc           |  44 ++--
 docs/user-manual/modules/ROOT/pages/books.adoc     |  20 +-
 docs/user-manual/modules/ROOT/pages/building.adoc  |   4 +-
 .../ROOT/pages/camel-configuration-utilities.adoc  | 120 ++++-----
 .../user-manual/modules/ROOT/pages/camel-core.adoc |   2 +-
 .../modules/ROOT/pages/camel-jar-dependencies.adoc |   6 +-
 .../modules/ROOT/pages/camel-run-maven-goal.adoc   |   8 +-
 .../ROOT/pages/commercial-camel-offerings.adoc     |   6 +-
 .../modules/ROOT/pages/configuring-camel.adoc      |  10 +-
 .../modules/ROOT/pages/content-enricher.adoc       |  58 ++--
 .../modules/ROOT/pages/correlation-identifier.adoc |   2 +-
 .../ROOT/pages/cronscheduledroutepolicy.adoc       |   8 +-
 .../modules/ROOT/pages/dead-letter-channel.adoc    |   8 +-
 .../modules/ROOT/pages/dozer-type-conversion.adoc  |   4 +-
 .../pages/enterprise-integration-patterns.adoc     |   2 +-
 .../ROOT/pages/eventDrivenConsumer-eip.adoc        |   8 +-
 .../modules/ROOT/pages/exception-clause.adoc       | 110 ++++----
 .../user-manual/modules/ROOT/pages/expression.adoc |   2 +-
 .../pages/faq/how-do-i-configure-endpoints.adoc    |  12 +-
 ...ow-do-i-import-routes-from-other-xml-files.adoc |  12 +-
 .../pages/faq/how-to-use-a-dynamic-uri-in-to.adoc  |   4 +-
 .../modules/ROOT/pages/graceful-shutdown.adoc      |   4 +-
 .../modules/ROOT/pages/guaranteed-delivery.adoc    |   4 +-
 .../modules/ROOT/pages/http-session-handling.adoc  |   6 +-
 docs/user-manual/modules/ROOT/pages/jmx.adoc       |  18 +-
 docs/user-manual/modules/ROOT/pages/json.adoc      |  48 ++--
 .../modules/ROOT/pages/message-channel.adoc        |   2 +-
 .../modules/ROOT/pages/oncompletion.adoc           |  14 +-
 .../ROOT/pages/parameter-binding-annotations.adoc  |  12 +-
 .../modules/ROOT/pages/point-to-point-channel.adoc |   2 +-
 .../modules/ROOT/pages/pojo-producing.adoc         |   8 +-
 .../modules/ROOT/pages/polling-consumer.adoc       |  36 +--
 .../modules/ROOT/pages/producertemplate.adoc       |   2 +-
 docs/user-manual/modules/ROOT/pages/rest-dsl.adoc  | 120 ++++-----
 .../modules/ROOT/pages/rollback-eip.adoc           |  12 +-
 .../modules/ROOT/pages/route-policy.adoc           |  20 +-
 .../ROOT/pages/scala-dsl-getting-started.adoc      |   2 +-
 .../modules/ROOT/pages/scripting-languages.adoc    |   2 +-
 .../modules/ROOT/pages/simple-language.adoc        |   4 +-
 .../ROOT/pages/simplescheduledroutepolicy.adoc     |  24 +-
 .../modules/ROOT/pages/spring-remoting.adoc        |  46 ++--
 .../modules/ROOT/pages/spring-testing.adoc         | 156 +++++------
 docs/user-manual/modules/ROOT/pages/spring.adoc    |  26 +-
 docs/user-manual/modules/ROOT/pages/support.adoc   |   6 +-
 docs/user-manual/modules/ROOT/pages/team.adoc      | 178 ++++++-------
 docs/user-manual/modules/ROOT/pages/testing.adoc   |  20 +-
 .../modules/ROOT/pages/threading-model.adoc        |   2 +-
 docs/user-manual/modules/ROOT/pages/toD-eip.adoc   |  20 +-
 .../modules/ROOT/pages/tokenize-language.adoc      |   6 +-
 docs/user-manual/modules/ROOT/pages/tracer.adoc    |   2 +-
 .../modules/ROOT/pages/transactional-client.adoc   |  12 +-
 .../modules/ROOT/pages/type-converter.adoc         |   4 +-
 .../modules/ROOT/pages/user-stories.adoc           |   6 +-
 .../ROOT/pages/using-propertyplaceholder.adoc      |  98 +++----
 .../ROOT/pages/what-are-the-dependencies.adoc      |   6 +-
 .../modules/ROOT/pages/wireTap-eip.adoc            |  12 +-
 .../modules/ROOT/pages/xml-reference.adoc          |   2 +-
 424 files changed, 3325 insertions(+), 3620 deletions(-)

diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index 07d6e55..bef029a 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -3,17 +3,17 @@
 
 *Available as of Camel version 2.14*
 
-The AHC-WS component provides Websocket
-based endpoints for a client communicating with
+The AHC-WS component provides Websocket
+based endpoints for a client communicating with
 external servers over Websocket (as a client opening a websocket
 connection to an external server). +
 The component uses the xref:ahc-component.adoc[AHC] component that in turn uses
-the 
-https://github.com/AsyncHttpClient/async-http-client[Async Http Client] 
+the 
+https://github.com/AsyncHttpClient/async-http-client[Async Http Client] 
 library.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -197,7 +197,7 @@ And the equivalent Spring sample:
 </camelContext>
 ------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 9cae9c1..93d891f 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -422,9 +422,9 @@ Using the JSSE Configuration Utility
 
 The AHC component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the AHC component.
 
 [[AHC-Programmaticconfigurationofthecomponent]]
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index f0c6f43..5a973ef 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -375,7 +375,7 @@ former is almost identical to the latter:
 // Consuming from AMQP queue
 from("amqp:queue:incoming").
   to(...);
- 
+ 
 // Sending message to the AMQP topic
 from(...).
   to("amqp:topic:notify");
@@ -388,13 +388,13 @@ from(...).
 [source,java]
 ----
 AMQPComponent amqp = AMQPComponent.amqpComponent("amqp://localhost:5672");
- 
+ 
 AMQPComponent authorizedAmqp = AMQPComponent.amqpComponent("amqp://localhost:5672", "user", "password");
 ----
 
 You can also add an instance
-of `org.apache.camel.component.amqp.AMQPConnectionDetails` to the
-registry in order to automatically configure the AMQP component. For example for Spring Boot you just have to define bean:
+of `org.apache.camel.component.amqp.AMQPConnectionDetails` to the
+registry in order to automatically configure the AMQP component. For example for Spring Boot you just have to define bean:
 
 *AMQP connection details auto-configuration*
 
@@ -404,7 +404,7 @@ registry in order to automatically configure the AMQP component. For example for
 AMQPConnectionDetails amqpConnection() {
   return new AMQPConnectionDetails("amqp://localhost:5672"); 
 }
- 
+ 
 @Bean
 AMQPConnectionDetails securedAmqpConnection() {
   return new AMQPConnectionDetails("amqp://localhost:5672", "username", "password"); 
@@ -425,7 +425,7 @@ AMQPConnectionDetails amqpConnection() {
 
 You can also rely on the xref:properties-component.adoc[Camel properties] to read
 the AMQP connection details. Factory
-method `AMQPConnectionDetails.discoverAMQP()` attempts to read Camel
+method `AMQPConnectionDetails.discoverAMQP()` attempts to read Camel
 properties in a Kubernetes-like convention, just as demonstrated on the
 snippet below:
 
@@ -437,9 +437,9 @@ export AMQP_SERVICE_HOST = "mybroker.com"
 export AMQP_SERVICE_PORT = "6666"
 export AMQP_SERVICE_USERNAME = "username"
 export AMQP_SERVICE_PASSWORD = "password"
- 
+ 
 ...
- 
+ 
 @Bean
 AMQPConnectionDetails amqpConnection() {
   return AMQPConnectionDetails.discoverAMQP(); 
@@ -459,8 +459,8 @@ For reference take a look at the https://qpid.apache.org/releases/qpid-jms-0.29.
 
 == Using topics
 
-To have using topics working with `camel-amqp` you need to configure the
-component to use `topic://` as topic prefix, as shown below:
+To have using topics working with `camel-amqp` you need to configure the
+component to use `topic://` as topic prefix, as shown below:
 
 [source,java]
 ----
@@ -474,7 +474,7 @@ component to use `topic://` as topic prefix, as shown below:
  </bean>
 ----
 
-Keep in mind that both  `AMQPComponent#amqpComponent()` methods and
+Keep in mind that both  `AMQPComponent#amqpComponent()` methods and
 `AMQPConnectionDetails` pre-configure the component with the topic
 prefix, so you don't have to configure it explicitly.
 
diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc
index 7cbc06d..9506c0c 100644
--- a/components/camel-apns/src/main/docs/apns-component.adoc
+++ b/components/camel-apns/src/main/docs/apns-component.adoc
@@ -183,7 +183,7 @@ Camel Apns uses these headers.
 |=======================================================================
 |Property |Default |Description
 |`CamelApnsTokens` | |Empty by default.
-|`CamelApnsMessageType` |`STRING, PAYLOAD, APNS_NOTIFICATION`  |In case you choose PAYLOAD for the message type, then the message will
+|`CamelApnsMessageType` |`STRING, PAYLOAD, APNS_NOTIFICATION`  |In case you choose PAYLOAD for the message type, then the message will
 be considered as a APNS payload and sent as is. In case you choose
 STRING, message will be converted as a APNS payload. From *Camel 2.16*
 onwards APNS_NOTIFICATION is used for sending message body as
@@ -206,7 +206,7 @@ And could be used like as follows:
 [source,java]
 -------------------------------------------------------------------------------------------
 ApnsServiceFactory proxiedApnsServiceFactory = new ApnsServiceFactory(){
-  
+  
   @Override
   protected ApnsServiceBuilder configureServiceBuilder(ApnsServiceBuilder serviceBuilder) {
     return serviceBuilder.withSocksProxy("my.proxy.com", 6666);
diff --git a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
index 5083b02..41fe017 100644
--- a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
+++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
@@ -184,23 +184,23 @@ as2://client/method?[options]
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
+the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelAS2.option`* header.
+option *`inBody=option`* would override a *`CamelAS2.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of AS2 API errors the endpoint will throw a
 RuntimeCamelException with a
-*org.apache.http.HttpException* derived exception
+*org.apache.http.HttpException* derived exception
 cause.
 
 [width="100%",cols="10%,10%,70%",options="header"]
@@ -210,7 +210,7 @@ cause.
 |send |ediMessage, requestUri, subject, from, as2From, as2To, as2MessageStructure, ediMessageContentType, ediMessageTransferEncoding, dispositionNotificationTo, signedReceiptMicAlgorithms |org.apache.http.protocol.HttpCoreContext
 |===
 
-URI Options for _client_
+URI Options for _client_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -254,23 +254,23 @@ as2://server/method?[options]
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
+the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelAS2.option`* header.
+option *`inBody=option`* would override a *`CamelAS2.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of AS2 API errors the endpoint will throw a
 RuntimeCamelException with a
-*org.apache.http.HttpException* derived exception
+*org.apache.http.HttpException* derived exception
 cause.
 
 [width="100%",cols="10%,10%,70%",options="header"]
@@ -280,7 +280,7 @@ cause.
 |listen |requestUriPattern |org.apache.http.protocol.HttpCoreContext
 |===
 
-URI Options for _server_
+URI Options for _server_
 
 
 [width="100%",cols="10%,90%",options="header"]
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index f24337d..3789a0c 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -3,12 +3,12 @@
 
 *Available as of Camel version 2.14*
 
-The Atmosphere-Websocket component provides Websocket
-based endpoints for a servlet communicating with
+The Atmosphere-Websocket component provides Websocket
+based endpoints for a servlet communicating with
 external clients over Websocket (as a servlet accepting websocket
 connections from external clients). +
 The component uses the xref:servlet-component.adoc[SERVLET] component and uses
-the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
+the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
 support the Websocket transport in various Servlet containers (e..g.,
 Jetty, Tomcat, ...).
 
@@ -18,7 +18,7 @@ component that starts the embedded Jetty server, this component uses the
 servlet provider of the container.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -206,7 +206,7 @@ And the equivalent Spring sample:
 </camelContext>
 ------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-avro/src/main/docs/avro-component.adoc b/components/camel-avro/src/main/docs/avro-component.adoc
index ab06fb9..105da2f 100644
--- a/components/camel-avro/src/main/docs/avro-component.adoc
+++ b/components/camel-avro/src/main/docs/avro-component.adoc
@@ -304,11 +304,11 @@ In the example above you need to fill `CamelAvroMessageName` header.
 
 [source,xml]
 -------------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="direct:start"/>
-            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-            <to uri="log:avro"/>
-        </route>
+        <route>
+            <from uri="direct:start"/>
+            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+            <to uri="log:avro"/>
+        </route>
 -------------------------------------------------------------------------------------------------------------------------------
 
 An example of consuming messages using camel avro consumers via netty:
diff --git a/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc b/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
index 7f9dd0e..4a8f64e 100644
--- a/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
+++ b/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
@@ -6,7 +6,7 @@
 The CW component allows messages to be sent to an
 https://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
 implementation of the Amazon API is provided by
-the https://aws.amazon.com/sdkforjava/[AWS SDK].
+the https://aws.amazon.com/sdkforjava/[AWS SDK].
 
 Prerequisites
 
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
index a0d5f43..4681b9f 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
@@ -4,13 +4,13 @@
 *Available as of Camel version 2.17*
 
 The DynamoDB Stream component supports receiving messages from
-Amazon DynamoDB Stream service.
+Amazon DynamoDB Stream service.
 
 Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon DynamoDB Streams. More information are available
-at https://aws.amazon.com/dynamodb/[AWS DynamoDB]
+at https://aws.amazon.com/dynamodb/[AWS DynamoDB]
 
 == URI Format
 
@@ -153,7 +153,7 @@ The component supports 16 options, which are listed below.
 
 Required DynampDBStream component options
 
-You have to provide the amazonDynamoDbStreamsClient in the
+You have to provide the amazonDynamoDbStreamsClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -177,7 +177,7 @@ aggregate this number of messages.
 
 == Usage
 
-=== AmazonDynamoDBStreamsClient configuration
+=== AmazonDynamoDBStreamsClient configuration
 
 You will need to create an instance of AmazonDynamoDBStreamsClient and
 bind it to the registry
@@ -201,7 +201,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 == Coping with Downtime
@@ -210,7 +210,7 @@ can be specified when calling createClient(...).
 
 The consumer will resume from the last seen sequence number (as
 implemented
-for https://issues.apache.org/jira/browse/CAMEL-9515[CAMEL-9515]), so
+for https://issues.apache.org/jira/browse/CAMEL-9515[CAMEL-9515]), so
 you should receive a flood of events in quick succession, as long as the
 outage did not also include DynamoDB itself.
 
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
index c1cb1f3..7649f40 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
@@ -10,7 +10,7 @@ Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon Kinesis. More information are available
-at https://aws.amazon.com/kinesis/[AWS Kinesis]
+at https://aws.amazon.com/kinesis/[AWS Kinesis]
 
 == URI Format
 
@@ -160,7 +160,7 @@ The component supports 18 options, which are listed below.
 
 Required Kinesis component options
 
-You have to provide the amazonKinesisClient in the
+You have to provide the amazonKinesisClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -220,7 +220,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 === Message headers used by the Kinesis producer to write to Kinesis.  The producer expects that the message body is a `byte[]`.
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
index fc3dda6..f81a181 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
@@ -9,7 +9,7 @@ Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon Kinesis Firehose. More information are available
-at https://aws.amazon.com/kinesis/firehose/[AWS Kinesis Firehose]
+at https://aws.amazon.com/kinesis/firehose/[AWS Kinesis Firehose]
 
 == URI Format
 
@@ -131,7 +131,7 @@ The component supports 13 options, which are listed below.
 
 Required Kinesis Firehose component options
 
-You have to provide the amazonKinesisClient in the
+You have to provide the amazonKinesisClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -170,7 +170,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 === Message headers set by the Kinesis producer on successful storage of a Record
diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
index 598b72c..479037c 100644
--- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
@@ -6,7 +6,7 @@
 The SNS component allows messages to be sent to an
 https://aws.amazon.com/sns[Amazon Simple Notification] Topic. The
 implementation of the Amazon API is provided by
-the https://aws.amazon.com/sdkforjava/[AWS SDK].
+the https://aws.amazon.com/sdkforjava/[AWS SDK].
 
 Prerequisites
 
diff --git a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
index 31eb619..7edb1e2 100644
--- a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
+++ b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
@@ -168,7 +168,7 @@ The component supports 33 options, which are listed below.
 
 Required SWF component options
 
-You have to provide the amazonSWClient in the
+You have to provide the amazonSWClient in the
 Registry or your accessKey and secretKey to access
 the https://aws.amazon.com/swf[Amazon's Simple Workflow Service].
 
@@ -264,11 +264,11 @@ completed tasks.
 
 === Advanced amazonSWClient configuration
 
-If you need more control over the AmazonSimpleWorkflowClient instance
+If you need more control over the AmazonSimpleWorkflowClient instance
 configuration you can create your own instance and refer to it from the
 URI:
 
-The `#client` refers to a AmazonSimpleWorkflowClient in the
+The `#client` refers to a AmazonSimpleWorkflowClient in the
 Registry.
 
 For example if your Camel Application is running behind a firewall:
diff --git a/components/camel-azure/src/main/docs/azure.adoc b/components/camel-azure/src/main/docs/azure.adoc
index bf6b77a..1bb0742 100644
--- a/components/camel-azure/src/main/docs/azure.adoc
+++ b/components/camel-azure/src/main/docs/azure.adoc
@@ -4,7 +4,7 @@
 The Camel Components for https://azure.microsoft.com/[Windows Azure Services]
 provide connectivity to Azure services from Camel.
 
- 
+ 
 [width="100%",cols="30%,10%,50%",options="header",]
 |=======================================================================
 |Azure Service |Camel Component |Component Description
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index 64f8e55..2c2c2da 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -158,6 +158,6 @@ the barcode data format as header variable:
 
 |BarcodeFormat |String |Value of com.google.zxing.BarcodeFormat.
 |=======================================================================
- 
+ 
 
- 
+ 
diff --git a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
index 9b41ca3..1a482ae 100644
--- a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
+++ b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
@@ -145,9 +145,9 @@ from("direct:test").
 <bean id="myValidationProviderResolver" class="org.apache.camel.component.bean.validator.HibernateValidationProviderResolver"/> 
 --------------------------------------------------------------------------------------------------------------------------------
 
-If no custom `ValidationProviderResolver` is defined and the validator
+If no custom `ValidationProviderResolver` is defined and the validator
 component has been deployed into the OSGi environment,
-the `HibernateValidationProviderResolver` will be automatically used.
+the `HibernateValidationProviderResolver` will be automatically used.
 
 == Example
 
diff --git a/components/camel-bean/src/main/docs/bean-language.adoc b/components/camel-bean/src/main/docs/bean-language.adoc
index 5fd1bbc..797a95c 100644
--- a/components/camel-bean/src/main/docs/bean-language.adoc
+++ b/components/camel-bean/src/main/docs/bean-language.adoc
@@ -6,7 +6,7 @@
 The purpose of the Bean Language is to be able to implement an
 xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using
 a simple method on a bean. The bean name is resolved using a xref:manual::registry.adoc[Registry], such as the
-xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is
+xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is
 invoked to evaluate the xref:manual::expression.adoc[Expression] or
 xref:manual::predicate.adoc[Predicate]. If no method name is provided then one
 is chosen using the rules for xref:manual::bean-binding.adoc[Bean Binding];
@@ -73,7 +73,7 @@ deprecated. Use the *`ref`* attribute instead.
 == Writing the Expression Bean
 
 The bean in the above examples is just any old Java Bean with a method
-called *`isGoldCustomer()`* that returns some object that is easily
+called *`isGoldCustomer()`* that returns some object that is easily
 converted to a *`boolean`* value in this case, as its used as a
 predicate.
 
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 4eeb521..1b8b746 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -7,7 +7,7 @@ Camel Beanstalk project provides a Camel component for job retrieval and
 post-processing of Beanstalk jobs.
 
 You can find the detailed explanation of Beanstalk job lifecycle
-at http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
+at http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
 protocol].
 
 == Dependencies
@@ -32,8 +32,8 @@ where `${camel-version`} must be replaced by the actual version of Camel.
 beanstalk://[host[:port]][/tube][?options]
 ------------------------------------------
 
-You may omit either `port` or both `host` and `port`: for the Beanstalk
-defaults to be used (“localhost” and 11300). If you omit `tube`,
+You may omit either `port` or both `host` and `port`: for the Beanstalk
+defaults to be used (“localhost” and 11300). If you omit `tube`,
 Beanstalk component will use the tube with name “default”.
 
 When listening, you may probably want to watch for jobs from several
@@ -160,33 +160,33 @@ The component supports 4 options, which are listed below.
 
 
 
-Producer behavior is affected by the `command` parameter which tells
+Producer behavior is affected by the `command` parameter which tells
 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 `consumer.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
+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
-of `bury`, `delete` or `release`.
+specifying `consumer.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 `consumer.useBlockIO` which corresponds to
 the same parameter in JavaBeanstalkClient library. By default it
-is `true`.
+is `true`.
 
-Be careful when specifying `release`, as the failed job will immediately
+Be careful when specifying `release`, as the failed job will immediately
 become available in the same tube and your consumer will try to acquire
-it again. You can `release` and specify _jobDelay_ though.
+it again. You can `release` and specify _jobDelay_ though.
 
-The beanstalk consumer is a Scheduled xref:manual::polling-consumer.adoc[Polling
+The beanstalk consumer is a Scheduled xref:manual::polling-consumer.adoc[Polling
 Consumer] which means there is more options you can configure, such as
 how frequent the consumer should poll. For more details
-see Polling Consumer.
+see Polling Consumer.
 
 == Consumer Headers
 
@@ -247,16 +247,16 @@ from("timer:dig?period=30seconds").
 In the first route we are listening for new jobs in tube “testTube”.
 When they are arriving, we are trying to parse integer value from the
 message body. If done successful, we log it and this successful exchange
-completion makes Camel component to _delete_ this job from Beanstalk
+completion makes Camel component to _delete_ this job from Beanstalk
 automatically. Contrary, when we cannot parse the job data, the exchange
-failed and the Camel component _buries_ it by default, so that it can be
+failed and the Camel component _buries_ it by default, so that it can be
 processed later or probably we are going to inspect failed jobs
 manually.
 
-So the second route periodically requests Beanstalk to _kick_ 10 jobs
+So the second route periodically requests Beanstalk to _kick_ 10 jobs
 out of buried and/or delayed state to the normal queue.
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
index 825bd53..7db66ad 100644
--- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
+++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
@@ -176,7 +176,7 @@ fields when CSV is generated
 fields when CSV is generated. This annotation is associated to the root class of the model and must be
 declared one time.
 
-|quoting |boolean |optional - default value = false - Indicate if the values (and headers)
+|quoting |boolean |optional - default value = false - Indicate if the values (and headers)
 must be quoted when marshaling when CSV is generated.
 
 |endWithLineBreak |boolean |optional - default value = true - Indicate if the CSV generated file
@@ -484,7 +484,7 @@ default value when the respective CSV field is empty/not available
 |impliedDecimalSeparator |boolean |optional - default value = "false" - Indicates if there is
 a decimal point implied at a specified location
 
-|lengthPos |int |optional - can be used to identify a data field in a
+|lengthPos |int |optional - can be used to identify a data field in a
 fixed-length record that defines the fixed length for this field
 
 |align |string |optional - default value = "R" - Align the text to the right or left within a fixed-length field.
@@ -789,7 +789,7 @@ record
 record
 
 |ignoreTrailingChars |boolean |optional - Indicates that characters beyond the last
-mapped filed can be ignored when unmarshalling / parsing. This annotation is associated to the root class of the model and must be
+mapped filed can be ignored when unmarshalling / parsing. This annotation is associated to the root class of the model and must be
 declared one time.
 |===
 
@@ -1688,7 +1688,7 @@ DataFormat bindy = new BindyCsvDataFormat(com.acme.model.MyModel.class);
 
 === Setting locale
 
-Bindy supports configuring the locale on the dataformat, such as 
+Bindy supports configuring the locale on the dataformat, such as 
 
 [source,java]
 ----
diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index 3adc3bc..a534da6 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -187,30 +187,30 @@ some endpoints. The endpoint URI MUST contain a prefix.
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelBox.<option>`*. Note that the *`inBody`* option
+the format *`CamelBox.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelBox.option`* header.
+option *`inBody=option`* would override a *`CamelBox.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of Box API errors the endpoint will throw a
 RuntimeCamelException with a
-*com.box.sdk.BoxAPIException* derived exception
+*com.box.sdk.BoxAPIException* derived exception
 cause.
 
-=== Endpoint Prefix _collaborations_
+=== Endpoint Prefix _collaborations_
 
 For more information on Box collaborations see
-https://developer.box.com/reference#collaboration-object[https://developer.box.com/reference#collaboration-object]. The
-following endpoints can be invoked with the prefix *`collaborations`* as
+https://developer.box.com/reference#collaboration-object[https://developer.box.com/reference#collaboration-object]. The
+following endpoints can be invoked with the prefix *`collaborations`* as
 follows:
 
 [source]
@@ -237,7 +237,7 @@ box:collaborations/endpoint?[options]
 |updateCollaborationInfo |updateInfo |collaborationId, info |com.box.sdk.BoxCollaboration
 |===
 
-URI Options for _collaborations_
+URI Options for _collaborations_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -257,11 +257,11 @@ URI Options for _collaborations_
 |info |com.box.sdk.BoxCollaboration.Info
 |===
 
-=== Endpoint Prefix _comments_
+=== Endpoint Prefix _comments_
 
 For more information on Box comments see
-https://developer.box.com/reference#comment-object[https://developer.box.com/reference#comment-object]. The
-following endpoints can be invoked with the prefix *`comments`* as
+https://developer.box.com/reference#comment-object[https://developer.box.com/reference#comment-object]. The
+following endpoints can be invoked with the prefix *`comments`* as
 follows:
 
 [source]
@@ -286,7 +286,7 @@ box:comments/endpoint?[options]
 |replyToComment |reply |commentId, message |com.box.sdk.BoxComment
 |===
 
-URI Options for _collaborations_
+URI Options for _collaborations_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -301,11 +301,11 @@ URI Options for _collaborations_
 
 |===
 
-=== Endpoint Prefix _events-logs_
+=== Endpoint Prefix _events-logs_
 
 For more information on Box event logs see
 https://developer.box.com/reference#events[https://developer.box.com/reference#events].
-The following endpoints can be invoked with the prefix *`event-logs`* as follows:
+The following endpoints can be invoked with the prefix *`event-logs`* as follows:
 
 [source]
 ----
@@ -319,7 +319,7 @@ box:event-logs/endpoint?[options]
 |getEnterpriseEvents |events |position, after, before, [types] |java.util.List
 |===
 
-URI Options for _event-logs_
+URI Options for _event-logs_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -334,12 +334,12 @@ URI Options for _event-logs_
 |types |com.box.sdk.BoxEvent.Types[]
 |===
 
-=== Endpoint Prefix _files_
+=== Endpoint Prefix _files_
 
 For more information on Box files see
 https://developer.box.com/reference#file-object[https://developer.box.com/reference#file-object].
 The following endpoints can be invoked with the
-prefix *`files`* as follows. 
+prefix *`files`* as follows. 
 
 [source]
 ----
@@ -459,7 +459,7 @@ URI Options for _files_
 For more information on Box folders see
 https://developer.box.com/reference#folder-object[https://developer.box.com/reference#folder-object].
 The following endpoints can be invoked with the prefix
-*`folders`* as follows. 
+*`folders`* as follows. 
 
 [source]
 ----
@@ -530,11 +530,11 @@ URI Options for _folders_
 |permissions |com.box.sdk.BoxSharedLink.Permissions
 |===
 
-=== Endpoint Prefix _groups_
+=== Endpoint Prefix _groups_
 
 For more information on Box groups see
 https://developer.box.com/reference#group-object[https://developer.box.com/reference#group-object].
-The following endpoints can be invoked with the prefix *`groups`* as
+The following endpoints can be invoked with the prefix *`groups`* as
 follows:
 
 [source]
@@ -569,7 +569,7 @@ box:groups/endpoint?[options]
 |updateGroupMembershipInfo |updateMembershipInfo |groupMembershipId, info |com.box.sdk.BoxGroupMembership
 |===
 
-URI Options for _groups_
+URI Options for _groups_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -589,11 +589,11 @@ URI Options for _groups_
 
 |===
 
-=== Endpoint Prefix _search_
+=== Endpoint Prefix _search_
 
 For more information on Box search API see
-https://developer.box.com/reference#searching-for-content[https://developer.box.com/reference#searching-for-content]. The
-following endpoints can be invoked with the prefix *`search`* as
+https://developer.box.com/reference#searching-for-content[https://developer.box.com/reference#searching-for-content]. The
+following endpoints can be invoked with the prefix *`search`* as
 follows:
 
 [source]
@@ -608,7 +608,7 @@ box:search/endpoint?[options]
 |searchFolder |search |folderId, query |java.util.Collection
 |===
 
-URI Options for _search_
+URI Options for _search_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -619,11 +619,11 @@ URI Options for _search_
 |query |String
 |===
 
-=== Endpoint Prefix _tasks_
+=== Endpoint Prefix _tasks_
 
 For information on Box tasks see
 https://developer.box.com/reference#task-object-1[https://developer.box.com/reference#task-object-1].
-The following endpoints can be invoked with the prefix *`tasks`* as
+The following endpoints can be invoked with the prefix *`tasks`* as
 follows:
 
 [source]
@@ -654,7 +654,7 @@ box:tasks/endpoint?[options]
 |getTaskAssignmentInfo |assignmentInfo |taskAssignmentId |com.box.sdk.BoxTaskAssignment.Info
 |===
 
-URI Options for _tasks_
+URI Options for _tasks_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -677,11 +677,11 @@ URI Options for _tasks_
 |taskAssignmentId |String
 |===
 
-=== Endpoint Prefix _users_
+=== Endpoint Prefix _users_
 
 For information on Box users see
 https://developer.box.com/reference#user-object[https://developer.box.com/reference#user-object].
-The following endpoints can be invoked with the prefix *`users`* as
+The following endpoints can be invoked with the prefix *`users`* as
 follows:
 
 [source]
@@ -714,7 +714,7 @@ box:users/endpoint?[options]
 |moveFolderToUser |- |userId, sourceUserId |com.box.sdk.BoxFolder.Info
 |===
 
-URI Options for _users_
+URI Options for _users_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -766,7 +766,7 @@ box:events/endpoint?[options]
 |events |  |[startingPosition] |com.box.sdk.BoxEvent 
 |===
 
-URI Options for _events_
+URI Options for _events_
 
 [width="100%",cols="10%,90%",options="header",]
 |===
@@ -777,7 +777,7 @@ URI Options for _events_
 
 == Message header
 
-Any of the options can be provided in a message header for producer
+Any of the options can be provided in a message header for producer
 endpoints with *CamelBox.* prefix.
 
 == Message body
@@ -804,8 +804,8 @@ from("box://events/listen?startingPosition=-1")
     .to("bean:blah");
 ----
 
-The following route uses a producer with dynamic header options. The
-*fileId* property has the Box file id and the *output* property has 
+The following route uses a producer with dynamic header options. The
+*fileId* property has the Box file id and the *output* property has 
 the output stream of the file contents, so they are assigned to the
 *CamelBox.fileId* header and *CamelBox.output* header respectively
 as follows:
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc
index 6de3a9d..649d71c 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -11,7 +11,7 @@ SDK].
 All client applications need API credential in order to process
 payments. In order to use camel-braintree with your account, you'll need
 to create a new
-https://www.braintreepayments.com/get-started[Sandbox] or https://www.braintreepayments.com/signup[Production]
+https://www.braintreepayments.com/get-started[Sandbox] or https://www.braintreepayments.com/signup[Production]
 account.
 
 
@@ -28,7 +28,7 @@ for this component:
 </dependency>
 --------------------------------------------
 
- 
+ 
 
 == Braintree Options
 
@@ -142,14 +142,14 @@ The component supports 15 options, which are listed below.
 
 == URI format
 
- 
+ 
 
 [source,java]
 ---------------------------------------------
 braintree://endpoint-prefix/endpoint?[options]
 ---------------------------------------------
 
- 
+ 
 
 Endpoint prefix can be one of:
 
@@ -171,14 +171,14 @@ Endpoint prefix can be one of:
 * transaction
 * webhookNotification
 
- 
+ 
 
 == BraintreeComponent
 
 The Braintree Component can be configured with the options below. These
 options can be provided using the component's bean
-property *configuration* of
-type *org.apache.camel.component.braintree.BraintreeConfiguration*.
+property *configuration* of
+type *org.apache.camel.component.braintree.BraintreeConfiguration*.
 
 [cols="<,<,<",options="header",]
 |=======================================================================
@@ -210,27 +210,27 @@ some endpoints. The endpoint URI MUST contain a prefix.
 Endpoint options that are not mandatory are denoted by []. When there
 are no mandatory options for an endpoint, one of the set of [] options
 MUST be provided. Producer endpoints can also use a special
-option *inBody* that in turn should contain the name of the endpoint
+option *inBody* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *CamelBraintree.<option>*. Note that the *inBody* option
-overrides message header, i.e. the endpoint option *inBody=option* would
-override a *CamelBraintree.option* header.
+the format *CamelBraintree.<option>*. Note that the *inBody* option
+overrides message header, i.e. the endpoint option *inBody=option* would
+override a *CamelBraintree.option* header.
 
 For more information on the endpoints and options see Braintree
 references
-at https://developers.braintreepayments.com/reference/overview[https://developers.braintreepayments.com/reference/overview]
+at https://developers.braintreepayments.com/reference/overview[https://developers.braintreepayments.com/reference/overview]
 
- 
+ 
 
-=== Endpoint prefix _addOn_
+=== Endpoint prefix _addOn_
 
-The following endpoints can be invoked with the prefix *addOn* as
+The following endpoints can be invoked with the prefix *addOn* as
 follows:
 
- 
+ 
 
 [source,java]
 --------------------------
@@ -240,15 +240,15 @@ braintree://addOn/endpoint
 [cols="<,<,<,<",options="header",]
 |====================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Addon>
+|all |  |  |List<com.braintreegateway.Addon>
 |====================================================
 
-=== Endpoint prefix _address_
+=== Endpoint prefix _address_
 
-The following endpoints can be invoked with the prefix *address* as
+The following endpoints can be invoked with the prefix *address* as
 follows:
 
- 
+ 
 
 [source,java]
 --------------------------------------
@@ -258,20 +258,20 @@ braintree://address/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |customerId, request
+|create |  |customerId, request
 |com.braintreegateway.Result<com.braintreegateway.Address>
 
-|delete |  |customerId, id
-|com.braintreegateway.Result<com.braintreegateway.Address> 
+|delete |  |customerId, id
+|com.braintreegateway.Result<com.braintreegateway.Address> 
 
-|find |  |customerId, id |com.braintreegateway.Address
+|find |  |customerId, id |com.braintreegateway.Address
 
-|update |  |customerId, id, request
-|com.braintreegateway.Result<com.braintreegateway.Address> 
+|update |  |customerId, id, request
+|com.braintreegateway.Result<com.braintreegateway.Address> 
 |=======================================================================
 
 [[Braintree-URIOptionsforaddress]]
-URI Options for _address_
+URI Options for _address_
 
 [cols="<,<",options="header",]
 |============================================
@@ -281,12 +281,12 @@ URI Options for _address_
 |id |String
 |============================================
 
-=== Endpoint prefix _clientToken_
+=== Endpoint prefix _clientToken_
 
-The following endpoints can be invoked with the prefix *clientToken* as
+The following endpoints can be invoked with the prefix *clientToken* as
 follows:
 
- 
+ 
 
 [source,java]
 ------------------------------------------
@@ -296,11 +296,11 @@ braintree://clientToken/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |====================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request |String
+|generate |  | request |String
 |====================================================
 
 [[Braintree-URIOptionsforclientToken]]
-URI Options for _clientToken_
+URI Options for _clientToken_
 
 [cols="<,<",options="header",]
 |================================================
@@ -308,12 +308,12 @@ URI Options for _clientToken_
 |request |com.braintreegateway.ClientTokenrequest
 |================================================
 
-=== Endpoint prefix _creditCardVerification_
+=== Endpoint prefix _creditCardVerification_
 
 The following endpoints can be invoked with the
-prefix *creditCardverification* as follows:
+prefix *creditCardverification* as follows:
 
- 
+ 
 
 [source,java]
 -----------------------------------------------------
@@ -323,14 +323,14 @@ braintree://creditCardVerification/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|find |  | id |com.braintreegateway.CreditCardVerification
+|find |  | id |com.braintreegateway.CreditCardVerification
 
-|search |  |query
+|search |  |query
 |com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVerification>
 |=======================================================================
 
 [[Braintree-URIOptionsforcreditCardVerification]]
-URI Options for _creditCardVerification_
+URI Options for _creditCardVerification_
 
 [cols="<,<",options="header",]
 |===============================================================
@@ -339,12 +339,12 @@ URI Options for _creditCardVerification_
 |query |com.braintreegateway.CreditCardVerificationSearchRequest
 |===============================================================
 
-=== Endpoint prefix _customer_
+=== Endpoint prefix _customer_
 
-The following endpoints can be invoked with the prefix *customer* as
+The following endpoints can be invoked with the prefix *customer* as
 follows:
 
- 
+ 
 
 [source,java]
 ---------------------------------------
@@ -354,25 +354,25 @@ braintree://customer/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  | 
+|all |  |  | 
 
-|create |  |request
+|create |  |request
 |com.braintreegateway.Result<com.braintreegateway.Customer>
 
-|delete |  |id
+|delete |  |id
 |com.braintreegateway.Result<com.braintreegateway.Customer>
 
-|find |  |id |com.braintreegateway.Customer
+|find |  |id |com.braintreegateway.Customer
 
-|search |  |query
+|search |  |query
 |com.braintreegateway.ResourceCollection<com.braintreegateway.Customer>
 
-|update |  |id, request
+|update |  |id, request
 |com.braintreegateway.Result<com.braintreegateway.Customer>
 |=======================================================================
 
 [[Braintree-URIOptionsforcustomer]]
-URI Options for _customer_
+URI Options for _customer_
 
 [cols="<,<",options="header",]
 |=================================================
@@ -382,12 +382,12 @@ URI Options for _customer_
 |query |com.braintreegateway.CustomerSearchRequest
 |=================================================
 
-=== Endpoint prefix _discount_
+=== Endpoint prefix _discount_
 
-The following endpoints can be invoked with the prefix *discount* as
+The following endpoints can be invoked with the prefix *discount* as
 follows:
 
- 
+ 
 
 [source,java]
 -----------------------------
@@ -397,16 +397,16 @@ braintree://discount/endpoint
 [cols="<,<,<,<",options="header",]
 |====================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Discount>
+|all |  |  |List<com.braintreegateway.Discount>
 |====================================================
 
  +
 
  +
 
-=== Endpoint prefix _dispute_
+=== Endpoint prefix _dispute_
 
-The following endpoints can be invoked with the prefix *dispute* as
+The following endpoints can be invoked with the prefix *dispute* as
 follows:
 
 [source,java]
@@ -417,36 +417,36 @@ braintree://dispute/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|accept |  |id
+|accept |  |id
 |com.braintreegateway.Result
 
-|addFileEvidence |  |disputeId, documentId
+|addFileEvidence |  |disputeId, documentId
 |com.braintreegateway.Result<DisputeEvidence>
 
-|addFileEvidence |  |disputeId, fileEvidenceRequest
+|addFileEvidence |  |disputeId, fileEvidenceRequest
 |com.braintreegateway.Result<DisputeEvidence>
 
-|addTextEvidence |  |disputeId, content
+|addTextEvidence |  |disputeId, content
 |com.braintreegateway.Result<DisputeEvidence>
 
-|addTextEvidence |  |disputeId, textEvidenceRequest
+|addTextEvidence |  |disputeId, textEvidenceRequest
 |com.braintreegateway.Result<DisputeEvidence>
 
-|finalize |  |id
+|finalize |  |id
 |com.braintreegateway.Result
 
-|find |  |id
+|find |  |id
 |com.braintreegateway.Dispute
 
-|removeEvidence |  |id
+|removeEvidence |  |id
 |com.braintreegateway.Result
 
-|search |  | disputeSearchRequest
+|search |  | disputeSearchRequest
 |com.braintreegateway.PaginatedCollection<com.braintreegateway.Dispute>
 |=======================================================================
 
 [[Braintree-URIOptionsfordispute]]
-URI Options for _dispute_
+URI Options for _dispute_
 
 [cols="<,<",options="header",]
 |==========================================================
@@ -461,9 +461,9 @@ URI Options for _dispute_
 |==========================================================
 
 
-=== Endpoint prefix _documentUpload_
+=== Endpoint prefix _documentUpload_
 
-The following endpoints can be invoked with the prefix *documentUpload* as
+The following endpoints can be invoked with the prefix *documentUpload* as
 follows:
 
 [source,java]
@@ -474,12 +474,12 @@ braintree://documentUpload/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
+|create |  |request
 |com.braintreegateway.Result<com.braintreegateway.DocumentUpload>
 |=======================================================================
 
 [[Braintree-URIOptionsfordocumentUpload]]
-URI Options for _documentUpload_
+URI Options for _documentUpload_
 
 [cols="<,<",options="header",]
 |==========================================================
@@ -488,12 +488,12 @@ URI Options for _documentUpload_
 |==========================================================
 
 
-=== Endpoint prefix _merchantAccount_
+=== Endpoint prefix _merchantAccount_
 
 The following endpoints can be invoked with the
-prefix *merchantAccount* as follows:
+prefix *merchantAccount* as follows:
 
- 
+ 
 
 [source,java]
 ----------------------------------------------
@@ -503,20 +503,20 @@ braintree://merchantAccount/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
+|create |  |request
 |com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
 
 |createForCurrency |  |currencyRequest
 |com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
 
-|find |  |id |com.braintreegateway.MerchantAccount
+|find |  |id |com.braintreegateway.MerchantAccount
 
-|update |  |id, request
+|update |  |id, request
 |com.braintreegateway.Result<com.braintreegateway.MerchantAccount>
 |=======================================================================
 
 [[Braintree-URIOptionsformerchantAccount]]
-URI Options for _merchantAccount_
+URI Options for _merchantAccount_
 
 [cols="<,<",options="header",]
 |====================================================
@@ -526,12 +526,12 @@ URI Options for _merchantAccount_
 |currencyRequest |com.braintreegateway.MerchantAccountCreateForCurrencyRequest
 |====================================================
 
-=== Endpoint prefix _paymentMethod_
+=== Endpoint prefix _paymentMethod_
 
 The following endpoints can be invoked with the
-prefix *paymentMethod* as follows:
+prefix *paymentMethod* as follows:
 
- 
+ 
 
 [source,java]
 --------------------------------------------
@@ -541,20 +541,20 @@ braintree://paymentMethod/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |request
+|create |  |request
 |com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
 
-|delete |  |token, deleteRequest
+|delete |  |token, deleteRequest
 |com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
 
-|find |  |token |com.braintreegateway.PaymentMethod
+|find |  |token |com.braintreegateway.PaymentMethod
 
-|update |  |token, request
+|update |  |token, request
 |com.braintreegateway.Result<com.braintreegateway.PaymentMethod>
 |=======================================================================
 
 [[Braintree-URIOptionsforpaymentMethod]]
-URI Options for _paymentMethod_
+URI Options for _paymentMethod_
 
 [cols="<,<",options="header",]
 |==================================================
@@ -564,12 +564,12 @@ URI Options for _paymentMethod_
 |deleteRequest |com.braintreegateway.PaymentMethodDeleteRequest
 |==================================================
 
-=== Endpoint prefix _paymentMethodNonce_
+=== Endpoint prefix _paymentMethodNonce_
 
 The following endpoints can be invoked with the
-prefix *paymentMethodNonce* as follows:
+prefix *paymentMethodNonce* as follows:
 
- 
+ 
 
 [source,java]
 -------------------------------------------------
@@ -579,14 +579,14 @@ braintree://paymentMethodNonce/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|create |  |paymentMethodToken
+|create |  |paymentMethodToken
 |com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce>
 
-|find |  |paymentMethodNonce |com.braintreegateway.PaymentMethodNonce
+|find |  |paymentMethodNonce |com.braintreegateway.PaymentMethodNonce
 |=======================================================================
 
 [[Braintree-URIOptionsforpaymentMethodNonce]]
-URI Options for _paymentMethodNonce_
+URI Options for _paymentMethodNonce_
 
 [cols="<,<",options="header",]
 |==========================
@@ -595,12 +595,12 @@ URI Options for _paymentMethodNonce_
 |paymentMethodNonce |String
 |==========================
 
-=== Endpoint prefix _plan_
+=== Endpoint prefix _plan_
 
-The following endpoints can be invoked with the prefix *plan* as
+The following endpoints can be invoked with the prefix *plan* as
 follows:
 
- 
+ 
 
 [source,java]
 -------------------------
@@ -610,13 +610,13 @@ braintree://plan/endpoint
 [cols="<,<,<,<",options="header",]
 |====================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|all |  |  |List<com.braintreegateway.Plan>
+|all |  |  |List<com.braintreegateway.Plan>
 |====================================================
 
 
-=== Endpoint prefix _report_
+=== Endpoint prefix _report_
 
-The following endpoints can be invoked with the prefix *report* as
+The following endpoints can be invoked with the prefix *report* as
 follows:
 
 [source,java]
@@ -627,11 +627,11 @@ braintree://plan/report?[options]
 [cols="<,<,<,<",options="header",]
 |==============================================================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|transactionLevelFees |  | request |com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport>
+|transactionLevelFees |  | request |com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport>
 |==============================================================================================================
 
 [[Braintree-URIOptionsfortreport]]
-URI Options for _report_
+URI Options for _report_
 
 [cols="<,<",options="header",]
 |==============================================================
@@ -640,12 +640,12 @@ URI Options for _report_
 |==============================================================
 
 
-=== Endpoint prefix _settlementBatchSummary_
+=== Endpoint prefix _settlementBatchSummary_
 
 The following endpoints can be invoked with the
-prefix *settlementBatchSummary* as follows:
+prefix *settlementBatchSummary* as follows:
 
- 
+ 
 
 [source,java]
 -----------------------------------------------------
@@ -655,12 +655,12 @@ braintree://settlementBatchSummary/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|generate |  | request
+|generate |  | request
 |com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary>
 |=======================================================================
 
 [[Braintree-URIOptionsforsettlementBatchSummary]]
-URI Options for _settlementBatchSummary_
+URI Options for _settlementBatchSummary_
 
 [cols="<,<",options="header",]
 |==========================
@@ -669,12 +669,12 @@ URI Options for _settlementBatchSummary_
 |groupByCustomField |String
 |==========================
 
-=== Endpoint prefix _subscription_
+=== Endpoint prefix _subscription_
 
-The following endpoints can be invoked with the prefix *subscription* as
+The following endpoints can be invoked with the prefix *subscription* as
 follows:
 
- 
+ 
 
 [source,java]
 -------------------------------------------
@@ -684,29 +684,29 @@ braintree://subscription/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|cancel |  | id
-| com.braintreegateway.Result<com.braintreegateway.Subscription>
+|cancel |  | id
+| com.braintreegateway.Result<com.braintreegateway.Subscription>
 
-|create |  |request
+|create |  |request
 |com.braintreegateway.Result<com.braintreegateway.Subscription>
 
-|delete |  |customerId, id
+|delete |  |customerId, id
 |com.braintreegateway.Result<com.braintreegateway.Subscription>
 
-|find |  |id |com.braintreegateway.Subscription
+|find |  |id |com.braintreegateway.Subscription
 
-|retryCharge |  |subscriptionId, amount
+|retryCharge |  |subscriptionId, amount
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|search |  |searchRequest
+|search |  |searchRequest
 |com.braintreegateway.ResourceCollection<com.braintreegateway.Subscription>
 
-|update |  |id, request
+|update |  |id, request
 |com.braintreegateway.Result<com.braintreegateway.Subscription>
 |=======================================================================
 
 [[Braintree-URIOptionsforsubscription]]
-URI Options for _subscription_
+URI Options for _subscription_
 
 [cols="<,<",options="header",]
 |==============================================================
@@ -719,14 +719,14 @@ URI Options for _subscription_
 |searchRequest |com.braintreegateway.SubscriptionSearchRequest.
 |==============================================================
 
- 
+ 
 
-=== Endpoint prefix _transaction_
+=== Endpoint prefix _transaction_
 
-The following endpoints can be invoked with the prefix *transaction* as
+The following endpoints can be invoked with the prefix *transaction* as
 follows:
 
- 
+ 
 
 [source,java]
 ------------------------------------------
@@ -736,44 +736,44 @@ braintree://transaction/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|cancelRelease |  |id
+|cancelRelease |  |id
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|cloneTransaction |  |id, cloneRequest
+|cloneTransaction |  |id, cloneRequest
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|credit |  |request
+|credit |  |request
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|find |  |id |com.braintreegateway.Transaction
+|find |  |id |com.braintreegateway.Transaction
 
-|holdInEscrow |  |id
+|holdInEscrow |  |id
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|releaseFromEscrow |  |id
+|releaseFromEscrow |  |id
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|refund |  |id, amount, refundRequest
+|refund |  |id, amount, refundRequest
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|sale |  |request
+|sale |  |request
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|search |  |query
+|search |  |query
 |com.braintreegateway.ResourceCollection<com.braintreegateway.Transaction>
 
-|submitForPartialSettlement |  |id, amount
+|submitForPartialSettlement |  |id, amount
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|submitForSettlement |  |id, amount, request
+|submitForSettlement |  |id, amount, request
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 
-|voidTransaction |  |id
+|voidTransaction |  |id
 |com.braintreegateway.Result<com.braintreegateway.Transaction>
 |=======================================================================
 
 [[Braintree-URIOptionsfortransaction]]
-URI Options for _transaction_
+URI Options for _transaction_
 
 [cols="<,<",options="header",]
 |==========================================================
@@ -786,12 +786,12 @@ URI Options for _transaction_
 |query |com.braintreegateway.TransactionSearchRequest
 |==========================================================
 
-=== Endpoint prefix _webhookNotification_
+=== Endpoint prefix _webhookNotification_
 
 The following endpoints can be invoked with the
-prefix *webhookNotification* as follows:
+prefix *webhookNotification* as follows:
 
- 
+ 
 
 [source,java]
 --------------------------------------------------
@@ -801,12 +801,12 @@ braintree://webhookNotification/endpoint?[options]
 [cols="<,<,<,<",options="header",]
 |=======================================================================
 |Endpoint |Shorthand Alias |Options |Result Body Type
-|parse |  | signature, payload |com.braintreegateway.WebhookNotification
-|verify |  |challenge |String
+|parse |  | signature, payload |com.braintreegateway.WebhookNotification
+|verify |  |challenge |String
 |=======================================================================
 
 [[Braintree-URIOptionsforwebhookNotification]]
-URI Options for _webhookNotification_
+URI Options for _webhookNotification_
 
 [cols="<,<",options="header",]
 |=================
@@ -816,34 +816,34 @@ URI Options for _webhookNotification_
 |challenge |String
 |=================
 
- 
+ 
 
 == Consumer Endpoints
 
 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
+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
 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
-the entire list or array. 
+property *consumer.splitResults=true* to return a single exchange for
+the entire list or array. 
 
 == Message Headers
 
 Any URI option can be provided in a message header for producer
-endpoints with a *CamelBraintree.* prefix.
+endpoints with a *CamelBraintree.* prefix.
 
 == Message body
 
 All result message bodies utilize objects provided by the Braintree Java
 SDK. Producer endpoints can specify the option name for incoming message
-body in the *inBody* endpoint parameter.
+body in the *inBody* endpoint parameter.
 
- 
+ 
 
- 
+ 
 
 == Examples
 
diff --git a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
index adba693..b68b57d 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
@@ -3,11 +3,11 @@
 
 *Available as of Camel version 2.20*
 
-The Caffeine Cache component enables you to perform caching operations using
+The Caffeine Cache component enables you to perform caching operations using
 the simple cache from Caffeine.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -27,7 +27,7 @@ caffeine-cache://cacheName[?options]
 -----------------------------
 
 You can append query options to the URI in the following
-format, `?option=value&option=#beanRef&...`
+format, `?option=value&option=#beanRef&...`
 
 == Options
 
diff --git a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
index f029b77..0bc6e0e 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
@@ -3,11 +3,11 @@
 
 *Available as of Camel version 2.20*
 
-The Caffeine Loadcache component enables you to perform caching operations using
+The Caffeine Loadcache component enables you to perform caching operations using
 The Load cache from Caffeine.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -27,7 +27,7 @@ caffeine-loadcache://cacheName[?options]
 -----------------------------
 
 You can append query options to the URI in the following
-format, `?option=value&option=#beanRef&...`
+format, `?option=value&option=#beanRef&...`
 
 == Options
 
diff --git a/components/camel-cassandraql/src/main/docs/cql-component.adoc b/components/camel-cassandraql/src/main/docs/cql-component.adoc
index 8b72cc3..7c844b1 100644
--- a/components/camel-cassandraql/src/main/docs/cql-component.adoc
+++ b/components/camel-cassandraql/src/main/docs/cql-component.adoc
@@ -165,7 +165,7 @@ The component supports 3 options, which are listed below.
 
 The Camel Cassandra endpoint expects a bunch of simple objects (`Object`
 or `Object[]` or `Collection<Object>`) which will be bound to the CQL
-statement as query parameters. If message body is null or empty, then 
+statement as query parameters. If message body is null or empty, then 
 CQL query will be executed without binding parameters.
 
 Headers:
@@ -176,9 +176,9 @@ either as a plain String or built using the `QueryBuilder`.
 === Outgoing Message
 
 The Camel Cassandra endpoint produces one or many a Cassandra Row
-objects depending on the `resultSetConversionStrategy`:
+objects depending on the `resultSetConversionStrategy`:
 
- 
+ 
 
 * `List<Row>` if `resultSetConversionStrategy` is `ALL` or
 `LIMIT_[0-9]+`
diff --git a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
index 05e3651..8974588 100644
--- a/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
+++ b/components/camel-cbor/src/main/docs/cbor-dataformat.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 3.0*
 
 CBOR is a Data Format which uses the
-http://wiki.fasterxml.com/JacksonHome/[Jackson library] with the
+http://wiki.fasterxml.com/JacksonHome/[Jackson library] with the
 https://github.com/FasterXML/jackson-dataformats-binary/tree/master/cbor[CBOR extension]
 to unmarshal a CBOR payload into Java objects or to marshal Java objects
 into a CBOR payload.
@@ -79,8 +79,8 @@ The component supports 12 options, which are listed below.
 
 === Using CBOR in Spring DSL
 
-When using Data Format in Spring DSL you need to
-declare the data formats first. This is done in the *DataFormats* XML
+When using Data Format in Spring DSL you need to
+declare the data formats first. This is done in the *DataFormats* XML
 tag.
 
 [source,xml]
diff --git a/components/camel-cdi/src/main/docs/cdi.adoc b/components/camel-cdi/src/main/docs/cdi.adoc
index 63bd9a9..3066eee 100644
--- a/components/camel-cdi/src/main/docs/cdi.adoc
+++ b/components/camel-cdi/src/main/docs/cdi.adoc
@@ -3,14 +3,14 @@
 
 The Camel CDI component provides auto-configuration for Apache Camel
 using CDI as dependency injection framework based
-on _convention-over-configuration_. It auto-detects Camel routes
+on _convention-over-configuration_. It auto-detects Camel routes
 available in the application and provides beans for common Camel
-primitives like `Endpoint`, `FluentProducerTemplate`, `ProducerTemplate` or `TypeConverter`. It
+primitives like `Endpoint`, `FluentProducerTemplate`, `ProducerTemplate` or `TypeConverter`. It
 implements standard Camel bean integration
-so that Camel annotations like `@Consume`, `@Produce`
-and `@PropertyInject` can be used seamlessly in CDI beans. Besides, it
+so that Camel annotations like `@Consume`, `@Produce`
+and `@PropertyInject` can be used seamlessly in CDI beans. Besides, it
 bridges Camel events (e.g. `RouteAddedEvent`,
-`CamelContextStartedEvent`, `ExchangeCompletedEvent`, ...) as CDI events
+`CamelContextStartedEvent`, `ExchangeCompletedEvent`, ...) as CDI events
 and provides a CDI events endpoint that can be used to consume / produce
 CDI events from / to Camel routes.
 
@@ -24,7 +24,7 @@ camel-cdi is deprecated in OSGi and not supported. Use OSGi Blueprint if using C
 
 == Auto-configured Camel context
 
-Camel CDI automatically deploys and configures a `CamelContext` bean.
+Camel CDI automatically deploys and configures a `CamelContext` bean.
 That `CamelContext` bean is automatically instantiated, configured and
 started (resp. stopped) when the CDI container initializes (resp. shuts
 down). It can be injected in the application, e.g.:
@@ -36,7 +36,7 @@ CamelContext context;
 ----
 
 That default `CamelContext` bean is qualified with the
-built-in `@Default` qualifier, is scoped `@ApplicationScoped` and is of
+built-in `@Default` qualifier, is scoped `@ApplicationScoped` and is of
 type `DefaultCamelContext`.
 
 Note that this bean can be customized programmatically and other Camel
@@ -45,7 +45,7 @@ context beans can be deployed in the application as well.
 [[CDI-Auto-detectingCamelroutes]]
 == Auto-detecting Camel routes
 
-Camel CDI automatically collects all the `RoutesBuilder` beans in the
+Camel CDI automatically collects all the `RoutesBuilder` beans in the
 application, instantiates and add them to the `CamelContext` bean
 instance when the CDI container initializes. For example, adding a Camel
 route is as simple as declaring a class, e.g.:
@@ -61,9 +61,9 @@ class MyRouteBean extends RouteBuilder {
 }
 ----
 
-Note that you can declare as many `RoutesBuilder` beans as you want.
-Besides, `RouteContainer` beans are also automatically collected,
-instantiated and added to the `CamelContext` bean instance managed by
+Note that you can declare as many `RoutesBuilder` beans as you want.
+Besides, `RouteContainer` beans are also automatically collected,
+instantiated and added to the `CamelContext` bean instance managed by
 Camel CDI when the container initializes.
 
 In some situations, it may be necessary to disable the auto-configuration of the `RouteBuilder` and `RouteContainer` beans. That can be achieved by observing for the `CdiCamelConfiguration` event, e.g.:
@@ -113,7 +113,7 @@ TypeConverter converter;
 == Camel context configuration
 
 If you just want to change the name of the default `CamelContext` bean,
-you can used the `@Named` qualifier provided by CDI, e.g.:
+you can used the `@Named` qualifier provided by CDI, e.g.:
 
 [source,java]
 ----
@@ -124,9 +124,9 @@ class CustomCamelContext extends DefaultCamelContext {
 }
 ----
 
-Else, if more customization is needed, any `CamelContext` class can be
+Else, if more customization is needed, any `CamelContext` class can be
 used to declare a custom Camel context bean. Then,
-the `@PostConstruct` and `@PreDestroy` lifecycle callbacks can be done
+the `@PostConstruct` and `@PreDestroy` lifecycle callbacks can be done
 to do the customization, e.g.:
 
 [source,java]
@@ -150,7 +150,7 @@ class CustomCamelContext extends DefaultCamelContext {
 ----
 
 http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#producer_method[Producer]
-and http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#disposer_method[disposer]
+and http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#disposer_method[disposer]
 methods can also be used as well to customize the Camel context bean, e.g.:
 
 [source,java]
@@ -171,8 +171,8 @@ class CamelContextFactory {
 }
 ----
 
-Similarly, http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#producer_field[producer
-fields] can be used, e.g.:
+Similarly, http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#producer_field[producer
+fields] can be used, e.g.:
 
 [source,java]
 ----
@@ -190,7 +190,7 @@ class CustomCamelContext extends DefaultCamelContext {
 
 This pattern can be used for example to avoid having the Camel context
 routes started automatically when the container initializes by calling
-the `setAutoStartup` method, e.g.:
+the `setAutoStartup` method, e.g.:
 
 [source,java]
 ----
@@ -208,7 +208,7 @@ class ManualStartupCamelContext extends DefaultCamelContext {
 
 To configure the sourcing of the configuration properties used by Camel
 to resolve properties placeholders, you can declare
-a `PropertiesComponent` bean qualified with `@Named("properties")`,
+a `PropertiesComponent` bean qualified with `@Named("properties")`,
 e.g.:
 
 [source,java]
@@ -227,9 +227,9 @@ PropertiesComponent propertiesComponent() {
 ----
 
 If you want to
-use http://deltaspike.apache.org/documentation/configuration.html[DeltaSpike
-configuration mechanism] you can declare the
-following `PropertiesComponent` bean:
+use http://deltaspike.apache.org/documentation/configuration.html[DeltaSpike
+configuration mechanism] you can declare the
+following `PropertiesComponent` bean:
 
 [source,java]
 ----
@@ -251,13 +251,13 @@ static class DeltaSpikeParser extends DefaultPropertiesParser {
 }
 ----
 
-You can see the `camel-example-cdi-properties` example for a working
+You can see the `camel-example-cdi-properties` example for a working
 example of a Camel CDI application using DeltaSpike configuration
 mechanism.
 
 == Auto-configured type converters
 
-CDI beans annotated with the `@Converter` annotation are automatically
+CDI beans annotated with the `@Converter` annotation are automatically
 registered into the deployed Camel contexts, e.g.:
 
 [source,java]
@@ -278,15 +278,15 @@ Note that CDI injection is supported within the type converters.
 
 === Camel annotations
 
-As part of the Camel http://camel.apache.org/bean-integration.html[bean
-integration], Camel comes with a set
-of http://camel.apache.org/bean-integration.html#BeanIntegration-Annotations[annotations] that
+As part of the Camel http://camel.apache.org/bean-integration.html[bean
+integration], Camel comes with a set
+of http://camel.apache.org/bean-integration.html#BeanIntegration-Annotations[annotations] that
 are seamlessly supported by Camel CDI. So you can use any of these
 annotations in your CDI beans, e.g.:
 
 [width="100%",cols="1,2a,2a",options="header",]
 |===
-|  |Camel annotation |CDI equivalent
+|  |Camel annotation |CDI equivalent
 |Configuration property a|
 [source,java]
 ----
@@ -390,7 +390,7 @@ void consume(@Body String body) {
 }
 ----
 
- | 
+ | 
 |===
 
 === Bean component
@@ -422,8 +422,8 @@ from("direct:inbound").bean("foo");
 === Referring beans from Endpoint URIs
 
 When configuring endpoints using the URI syntax you can refer to beans
-in the Registry using the `pass:[#]` notation. If the URI
-parameter value starts with a `pass:[#]` sign then Camel CDI will lookup for a
+in the Registry using the `pass:[#]` notation. If the URI
+parameter value starts with a `pass:[#]` sign then Camel CDI will lookup for a
 bean of the given type by name, e.g.:
 
 [source,java]
@@ -432,7 +432,7 @@ from("jms:queue:{{destination}}?transacted=true&transactionManager=#jtaTransacti
 ----
 
 Having the following CDI bean qualified
-with `@Named("jtaTransactionManager")`:
+with `@Named("jtaTransactionManager")`:
 
 [source,java]
 ----
@@ -450,11 +450,11 @@ PlatformTransactionManager createTransactionManager(TransactionManager transacti
 == Camel events to CDI events
 
 Camel provides a set
-of http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/event/package-summary.html[management
-events] that can be subscribed to for listening to Camel context,
+of http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/management/event/package-summary.html[management
+events] that can be subscribed to for listening to Camel context,
 service, route and exchange events. Camel CDI seamlessly translates
 these Camel events into CDI events that can be observed using
-CDI http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_methods[observer
+CDI http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_methods[observer
 methods], e.g.:
 
 [source,java]
@@ -477,8 +477,8 @@ void onRouteStarted(@Observes @Named("foo") RouteStartedEvent event) {
 }
 ----
 
-Similarly, the `@Default` qualifier can be used to observe Camel events
-for the _default_ Camel context if multiples contexts exist, e.g.:
+Similarly, the `@Default` qualifier can be used to observe Camel events
+for the _default_ Camel context if multiples contexts exist, e.g.:
 
 [source,java]
 ----
@@ -487,7 +487,7 @@ void onExchangeCompleted(@Observes @Default ExchangeCompletedEvent event) {
 }
 ----
 
-In that example, if no qualifier is specified, the `@Any` qualifier is
+In that example, if no qualifier is specified, the `@Any` qualifier is
 implicitly assumed, so that corresponding events for all the Camel
 contexts get received.
 
@@ -498,13 +498,13 @@ detected in the deployment, and that per Camel context.
 == CDI events endpoint
 
 The CDI event endpoint bridges
-the http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#events[CDI
-events] with the Camel routes so that CDI events can be seamlessly
+the http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#events[CDI
+events] with the Camel routes so that CDI events can be seamlessly
 observed / consumed (resp. produced / fired) from Camel consumers (resp.
 by Camel producers).
 
-The `CdiEventEndpoint<T>` bean provided by Camel CDI can be used to
-observe / consume CDI events whose _event type_ is `T`, for example:
+The `CdiEventEndpoint<T>` bean provided by Camel CDI can be used to
+observe / consume CDI events whose _event type_ is `T`, for example:
 
 [source,java]
 ----
@@ -529,8 +529,8 @@ void observeCdiEvents(@Observes String event) {
 from("direct:event").log("CDI event received: ${body}");
 ----
 
-Conversely, the `CdiEventEndpoint<T>` bean can be used to produce / fire
-CDI events whose _event type_ is `T`, for example:
+Conversely, the `CdiEventEndpoint<T>` bean can be used to produce / fire
+CDI events whose _event type_ is `T`, for example:
 
 [source,java]
 ----
@@ -567,10 +567,10 @@ from("direct:event")
     .log("CDI event sent: ${body}");
 ----
 
-The type variable `T` (resp. the qualifiers) of a
-particular `CdiEventEndpoint<T>` injection point are automatically
-translated into the parameterized _event type_ (resp. into the _event
-qualifiers_) e.g.:
+The type variable `T` (resp. the qualifiers) of a
+particular `CdiEventEndpoint<T>` injection point are automatically
+translated into the parameterized _event type_ (resp. into the _event
+qualifiers_) e.g.:
 
 [source,java]
 ----
@@ -586,17 +586,17 @@ void observeCdiEvents(@Observes @FooQualifier List<String> event) {
 ----
 
 Note that the CDI event Camel endpoint dynamically adds
-an http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_methods[observer
-method] for each unique combination of _event type_ and _event
-qualifiers_ and solely relies on the container
-typesafe http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_resolution[observer
+an http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_methods[observer
+method] for each unique combination of _event type_ and _event
+qualifiers_ and solely relies on the container
+typesafe http://docs.jboss.org/cdi/spec/1.2/cdi-spec.html#observer_resolution[observer
 resolution], which leads to an implementation as efficient as possible.
 
-Besides, as the impedance between the _typesafe_ nature of CDI and
-the _dynamic_ nature of
-the http://camel.apache.org/component.html[Camel component] model is
+Besides, as the impedance between the _typesafe_ nature of CDI and
+the _dynamic_ nature of
+the http://camel.apache.org/component.html[Camel component] model is
 quite high, it is not possible to create an instance of the CDI event
-Camel endpoint via http://camel.apache.org/uris.html[URIs]. Indeed, the
+Camel endpoint via http://camel.apache.org/uris.html[URIs]. Indeed, the
 URI format for the CDI event component is:
 
 [source,text]
@@ -604,10 +604,10 @@ URI format for the CDI event component is:
 cdi-event://PayloadType<T1,...,Tn>[?qualifiers=QualifierType1[,...[,QualifierTypeN]...]]
 ----
 
-With the authority `PayloadType` (resp. the `QualifierType`) being the
+With the authority `PayloadType` (resp. the `QualifierType`) being the
 URI escaped fully qualified name of the payload (resp. qualifier) raw
 type followed by the type parameters section delimited by angle brackets
-for payload parameterized type. Which leads to _unfriendly_ URIs,
+for payload parameterized type. Which leads to _unfriendly_ URIs,
 e.g.:
 
 [source,text]
@@ -623,11 +623,11 @@ deployment phase.
 == Camel XML configuration import
 
 While CDI favors a typesafe dependency injection mechanism, it may be
-useful to reuse existing Camel XML configuration files into a Camel CDI
-application. In other use cases, it might be handy to rely on the Camel
-XML DSL to configure its Camel context(s).
+useful to reuse existing Camel XML configuration files into a Camel CDI
+application. In other use cases, it might be handy to rely on the Camel
+XML DSL to configure its Camel context(s).
 
-You can use the `@ImportResource` annotation that's provided by Camel
+You can use the `@ImportResource` annotation that's provided by Camel
 CDI on any CDI beans and Camel CDI will automatically load the Camel XML
 configuration at the specified locations, e.g.:
 
@@ -659,7 +659,7 @@ following Camel XML configuration:
 <camelContext/>
 ----
 
-The corresponding CDI beans are automatically deployed and can be
+The corresponding CDI beans are automatically deployed and can be
 injected, e.g.:
 
 [source,java]
@@ -673,7 +673,7 @@ Endpoint endpoint;
 ----
 
 Conversely, CDI beans deployed in the application can be referred to
-from the Camel XML configuration, usually using the `ref` attribute,
+from the Camel XML configuration, usually using the `ref` attribute,
 e.g., given the following bean declared:
 
 [source,java]
@@ -837,8 +837,8 @@ MockEndpoint outbound = endpoints
 
 == Maven Archetype
 
-Among the available xref:manual::camel-maven-archetypes.adoc[Camel Maven
-archetypes], you can use the provided `camel-archetype-cdi` to generate
+Among the available xref:manual::camel-maven-archetypes.adoc[Camel Maven
+archetypes], you can use the provided `camel-archetype-cdi` to generate
 a Camel CDI Maven project, e.g.:
 
 [source,text]
diff --git a/components/camel-chunk/src/main/docs/chunk-component.adoc b/components/camel-chunk/src/main/docs/chunk-component.adoc
index 4e21cc9..2462062 100644
--- a/components/camel-chunk/src/main/docs/chunk-component.adoc
+++ b/components/camel-chunk/src/main/docs/chunk-component.adoc
@@ -3,13 +3,13 @@
 
 *Available as of Camel version 2.15*
 
-The Chunk component allows for processing a message using a
-http://www.x5software.com/chunk/examples/ChunkExample?loc=en_US[Chunk] template.
-This can be ideal when using Templating to
+The Chunk component allows for processing a message using a
+http://www.x5software.com/chunk/examples/ChunkExample?loc=en_US[Chunk] template.
+This can be ideal when using Templating to
 generate responses for requests.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ---------------------------------------------------------------------------------
@@ -27,11 +27,11 @@ their `pom.xml` for this component:
 chunk:templateName[?options]
 ----------------------------
 
-Where *templateName* is the classpath-local URI of the template to
+Where *templateName* is the classpath-local URI of the template to
 invoke.
 
 You can append query options to the URI in the following
-format, `?option=value&option=value&...`
+format, `?option=value&option=value&...`
 
 == Options
 
@@ -119,16 +119,16 @@ The component supports 3 options, which are listed below.
 
 
 Chunk component will look for a specific template in _themes_ folder
-with extensions _.chtml_ or _.cxml. _If you need to specify a different
+with extensions _.chtml_ or _.cxml. _If you need to specify a different
 folder or extensions, you will need to use the specific options listed
 above.
 
 == Chunk Context
 
 Camel will provide exchange information in the Chunk context (just
-a `Map`). The `Exchange` is transferred as:
+a `Map`). The `Exchange` is transferred as:
 
- 
+ 
 [width="100%",cols="20%,80%",options="header",]
 |=======================================================================
 |key |value
@@ -176,7 +176,7 @@ to("chunk:template");
 --------------------------
 
 To use a Chunk template to formulate a response for a message for InOut
-message exchanges (where there is a `JMSReplyTo` header).
+message exchanges (where there is a `JMSReplyTo` header).
 
 If you want to use InOnly and consume the message and send it to another
 destination you could use:
@@ -216,7 +216,7 @@ email. The email template is laid out in Chunk as:
 
 [source,java]
 ----------------------------------------------
- 
+ 
 Dear {$headers.lastName}, {$headers.firstName}
 
 Thanks for the order of {$headers.item}.
diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
index ee93c9f..b44ea86 100644
--- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
+++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
@@ -21,10 +21,10 @@ for this component:
 [source,xml]
 ---
 <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cm-sms</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cm-sms</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
 </dependency>
 ---
 
diff --git a/components/camel-coap/src/main/docs/coap-component.adoc b/components/camel-coap/src/main/docs/coap-component.adoc
index 78c0d37..a0adcc3 100644
--- a/components/camel-coap/src/main/docs/coap-component.adoc
+++ b/components/camel-coap/src/main/docs/coap-component.adoc
@@ -31,10 +31,10 @@ for this component:
 [source,xml]
 ---------------------------------------------------------
 <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-coap</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-coap</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
 </dependency>
 ---------------------------------------------------------
 
diff --git a/components/camel-cometd/src/main/docs/cometd-component.adoc b/components/camel-cometd/src/main/docs/cometd-component.adoc
index d8d4138..ac0ab07 100644
--- a/components/camel-cometd/src/main/docs/cometd-component.adoc
+++ b/components/camel-cometd/src/main/docs/cometd-component.adoc
@@ -184,9 +184,9 @@ http://cometd.org/documentation/howtos/authentication[documented here]
 
 The Cometd component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the Cometd component. You need to configure SSL
 on the CometdComponent.
 
@@ -234,7 +234,7 @@ Spring DSL based configuration of endpoint
           password="keystorePassword"/>
     </camel:keyManagers>
   </camel:sslContextParameters>...
- 
+ 
   <bean id="cometd" class="org.apache.camel.component.cometd.CometdComponent">
     <property name="sslContextParameters" ref="sslContextParameters"/>
   </bean>
diff --git a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
index 354d52c..12347f7 100644
--- a/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/pgp-dataformat.adoc
@@ -198,7 +198,7 @@ If you verify a signature you not only want to verify the correctness of
 the signature but you also want check that the signature comes from a
 certain identity or a specific set of identities. Therefore it is
 possible to restrict the number of public keys from the public keyring
-which can be used for the verification of a signature.  
+which can be used for the verification of a signature.  
 
 *Signature User IDs*
 
@@ -208,13 +208,13 @@ which can be used for the verification of a signature.  
  List<String> expectedSigUserIds = new ArrayList<String>();
  expectedSigUserIds.add("Trusted company1");
  expectedSigUserIds.add("Trusted company2");
- 
+ 
  PGPDataFormat pgpVerifyWithSpecificKeysAndDecrypt = new PGPDataFormat();
  pgpVerifyWithSpecificKeysAndDecrypt.setPassword("my password"); // for decrypting with private key
  pgpVerifyWithSpecificKeysAndDecrypt.setKeyFileName(keyfileName);
  pgpVerifyWithSpecificKeysAndDecrypt.setSignatureKeyFileName(signatgureKeyfileName);
  pgpVerifyWithSpecificKeysAndDecrypt.setSignatureKeyUserids(expectedSigUserIds); // if you have only one signer identity then you can also use setSignatureKeyUserid("expected Signer")
- 
+ 
 from("direct:start")
          ...     
         .unmarshal(pgpVerifyWithSpecificKeysAndDecrypt)
@@ -248,7 +248,7 @@ User IDs which relate to several private keys in the secret keyring.
  signerUserIds.add("company old key");
  signerUserIds.add("company new key");
  pgpSignAndEncryptSeveralSignerKeys.setSignatureKeyUserids(signerUserIds);
- 
+ 
 from("direct:start")
          ...     
         .marshal(pgpSignAndEncryptSeveralSignerKeys)
@@ -262,7 +262,7 @@ have a primary key and sub-keys. The usage of the keys is indicated by
 the so called https://tools.ietf.org/html/rfc4880#section-5.2.3.21[Key
 Flags]. For example, you can have a primary key with two sub-keys; the
 primary key shall only be used for certifying other keys (Key Flag
-0x01), the first sub-key  shall only be used for signing (Key Flag
+0x01), the first sub-key  shall only be used for signing (Key Flag
 0x02), and the second sub-key shall only be used for encryption (Key
 Flag 0x04 or 0x08). The PGP Data Format marshaler takes into account
 these Key Flags of the primary key and sub-keys in order to determine
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 6d44b16..8aa00b2 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -648,7 +648,7 @@ camel-cxf endpont or add a message header for it like
 
 == How to override the CXF producer address from message header
 
-The `camel-cxf` producer supports to override the services address by
+The `camel-cxf` producer supports to override the services address by
 setting the message with the key of "CamelDestinationOverrideUrl".
 
 [source,java]
@@ -736,8 +736,8 @@ headers).
 You can also use the same way as described in
 sub-chapter "How to get and set SOAP headers in POJO mode" to set or get
 the SOAP headers. So, you can use now the
-header "org.apache.cxf.headers.Header.list" to get and set a list of
-SOAP headers.This does also mean that if you have a route that forwards
+header "org.apache.cxf.headers.Header.list" to get and set a list of
+SOAP headers.This does also mean that if you have a route that forwards
 from one Camel-cxf endpoint to another (SOAP Client -> Camel -> CXF
 service), now also the SOAP headers sent by the SOAP client are
 forwarded to the CXF service. If you do not want that these headers are
@@ -803,11 +803,11 @@ response context with the following code:
 == Attachment Support
 
 *POJO Mode:* Both SOAP with Attachment and MTOM are supported (see
-example in Payload Mode for enabling MTOM).  However, SOAP with
-Attachment is not tested.  Since attachments are marshalled and
+example in Payload Mode for enabling MTOM).  However, SOAP with
+Attachment is not tested.  Since attachments are marshalled and
 unmarshalled into POJOs, users typically do not need to deal with the
-attachment themself.  Attachments are propagated to Camel message's
-attachments if the MTOM is not enabled.  So, it is
+attachment themself.  Attachments are propagated to Camel message's
+attachments if the MTOM is not enabled.  So, it is
 possible to retrieve attachments by Camel Message API
 
 [source,java]
@@ -819,7 +819,7 @@ DataHandler Message.getAttachment(String id)
 retrieved by Camel Message APIs mentioned above. SOAP with Attachment
 (SwA) is supported and attachments can be retrieved. SwA is
 the default (same as setting the CXF endpoint property "mtom-enabled" to
-false). 
+false). 
 
 To enable MTOM, set the CXF endpoint property "mtom-enabled" to _true_.
 (I believe you can only do it with Spring.)
@@ -876,7 +876,7 @@ will override this value for that endpoint.
 
 The camel-cxf component supports the generic
 https://cxf.apache.org/docs/jax-ws-dispatch-api.html[CXF dispatch
-mode] that can transport messages of arbitrary structures (i.e., not
+mode] that can transport messages of arbitrary structures (i.e., not
 bound to a specific XML schema). To use this mode, you simply omit
 specifying the wsdlURL and serviceClass attributes of the CXF endpoint.
 
@@ -894,7 +894,7 @@ specific SOAPAction header. Therefore, when the target service requires
 a specific SOAPAction value, it is supplied in the Camel header using
 the key SOAPAction (case-insensitive).
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
index d001422..60c76dc 100644
--- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
@@ -176,7 +176,7 @@ schema file], there are two elements for the REST endpoint definition.
 
 == How to override the CXF producer address from message header
 
-The `camel-cxfrs` producer supports to override the services address by
+The `camel-cxfrs` producer supports to override the services address by
 setting the message with the key of "CamelDestinationOverrideUrl".
 
 [source,java]
@@ -317,13 +317,13 @@ https://svn.apache.org/repos/asf/camel/trunk/components/camel-cxf/src/test/java/
 
 == Consuming a REST Request - Default Binding Style
 
-The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
 implements the https://javaee.github.io/jsr311/[JAX-RS (JSR-311) API], so we can
 export the resources classes as a REST service. And we leverage the
 http://cxf.apache.org/docs/invokers.html[CXF Invoker
 API] to turn a REST request into a normal Java object method
 invocation.
- Unlike the xref:restlet-component.adoc[Camel Restlet] component, you don't need
+ Unlike the xref:restlet-component.adoc[Camel Restlet] component, you don't need
 to specify the URI template within your endpoint, CXF takes care of the
 REST request URI to resource class method mapping according to the
 JSR-311 specification. All you need to do in Camel is delegate this
@@ -412,15 +412,15 @@ public interface CustomerServiceResource {
 
 == How to invoke the REST service through camel-cxfrs producer
 
-The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end]
 implements
 http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-Proxy-basedAPI[a
 proxy-based client API], with this API you can invoke the remote REST
-service through a proxy. The `camel-cxfrs` producer is based on this
+service through a proxy. The `camel-cxfrs` producer is based on this
 http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-Proxy-basedAPI[proxy
 API].
  You just need to specify the operation name in the message header and
-prepare the parameter in the message body, the camel-cxfrs producer will
+prepare the parameter in the message body, the camel-cxfrs producer will
 generate right REST request for you.
 
 Here is an example:
@@ -454,20 +454,20 @@ assertEquals("Get a wrong response code", 200, exchange.getOut().getHeader(Excha
 assertEquals("Get a wrong header value", "value", exchange.getOut().getHeader("key"));
 ----
 
-The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end] also
+The http://cxf.apache.org/docs/jax-rs.html[CXF JAXRS front end] also
 provides
 http://cxf.apache.org/docs/jax-rs-client-api.html#JAX-RSClientAPI-CXFWebClientAPI[a
-http centric client API]. You can also invoke this API from
+http centric client API]. You can also invoke this API from
 `camel-cxfrs` producer. You need to specify the
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchange.html#HTTP_PATH[HTTP_PATH]
 and
-the http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchange.html#HTTP_METHOD[HTTP_METHOD] and
-let the producer use the http centric client API by using the URI option
+the http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Exchange.html#HTTP_METHOD[HTTP_METHOD] and
+let the producer use the http centric client API by using the URI option
 *httpClientAPI* or by setting the message header
 http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfConstants.html#CAMEL_CXF_RS_USING_HTTP_API[CxfConstants.CAMEL_CXF_RS_USING_HTTP_API].
 You can turn the response object to the type class specified with the
 message
-header http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfConstants.html#CAMEL_CXF_RS_RESPONSE_CLASS[CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS].
+header http://camel.apache.org/maven/current/camel-cxf/apidocs/org/apache/camel/component/cxf/CxfConstants.html#CAMEL_CXF_RS_RESPONSE_CLASS[CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS].
 [source,java]
 ----
 Exchange exchange = template.send("direct://http", new Processor() {
diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc
index d9fc80c..9e15139 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -37,8 +37,8 @@ Camel ships with a support implementation of
 `org.apache.camel.component.dataset.DataSetSupport` class, that can be
 used as a base for implementing your own DataSet. Camel also ships with
 some implementations that can be used for testing:
- `org.apache.camel.component.dataset.SimpleDataSet`, `org.apache.camel.component.dataset.ListDataSet`
-and `org.apache.camel.component.dataset.FileDataSet`, all of which
+ `org.apache.camel.component.dataset.SimpleDataSet`, `org.apache.camel.component.dataset.ListDataSet`
+and `org.apache.camel.component.dataset.FileDataSet`, all of which
 extend `DataSetSupport`.
 
 == Options
@@ -169,10 +169,10 @@ The above would look in the Registry to find the
 
 Then you create a DataSet implementation, such as using the
 `SimpleDataSet` as described below, configuring things like how big the
-data set is and what the messages look like etc.  
- 
+data set is and what the messages look like etc.  
+ 
 
-== DataSetSupport (abstract class)
+== DataSetSupport (abstract class)
 
 The DataSetSupport abstract class is a nice starting point for new
 DataSets, and provides some useful features to derived classes.
@@ -217,7 +217,7 @@ configure the `SimpleDataSet` to use it by setting the
 
 *Available since Camel 2.17*
 
-The List`DataSet` extends `DataSetSupport`, and adds a list of default
+The List`DataSet` extends `DataSetSupport`, and adds a list of default
 bodies.
 
 === Additional Properties on ListDataSet
@@ -245,7 +245,7 @@ the payload for the exchange will be selected using the modulus of the
 
 *Available since Camel 2.17*
 
-The `FileDataSet` extends `ListDataSet`, and adds support for loading
+The `FileDataSet` extends `ListDataSet`, and adds support for loading
 the bodies from a file.
 
 === Additional Properties on FileDataSet
diff --git a/components/camel-docker/src/main/docs/docker-component.adoc b/components/camel-docker/src/main/docs/docker-component.adoc
index cf3fa15..8352ef4 100644
--- a/components/camel-docker/src/main/docs/docker-component.adoc
+++ b/components/camel-docker/src/main/docs/docker-component.adoc
@@ -6,7 +6,7 @@
 Camel component for communicating with Docker.
 
 The Docker Camel component leverages the
-https://github.com/docker-java/docker-java[docker-java] via the
+https://github.com/docker-java/docker-java[docker-java] via the
 https://docs.docker.com/reference/api/docker_remote_api[Docker Remote
 API].
 
diff --git a/components/camel-dozer/src/main/docs/dozer-component.adoc b/components/camel-dozer/src/main/docs/dozer-component.adoc
index dedcdae..978495c 100644
--- a/components/camel-dozer/src/main/docs/dozer-component.adoc
+++ b/components/camel-dozer/src/main/docs/dozer-component.adoc
@@ -3,12 +3,12 @@
 
 *Available as of Camel version 2.15*
 
-The Dozer component provides the ability to map between Java beans
+The Dozer component provides the ability to map between Java beans
 using the http://camel.apache.org/dozer-type-conversion.html[Dozer]
-mapping framework.  Camel also supports the ability
+mapping framework.  Camel also supports the ability
 to trigger Dozer mappings
 http://camel.apache.org/dozer-type-conversion.html[as a type converter].
- The primary differences between using a Dozer endpoint and a Dozer
+ The primary differences between using a Dozer endpoint and a Dozer
 converter are:
 
 * The ability to manage Dozer mapping configuration on a per-endpoint
@@ -21,7 +21,7 @@ of Dozer to support additional functionality (e.g. mapping literal
 values, using expressions for mappings, etc.).
 
 In order to use the Dozer component, Maven users will need to add the
-following dependency to their `pom.xml`:
+following dependency to their `pom.xml`:
 
 [source,xml]
 ------------------------------------------------------------
@@ -42,8 +42,8 @@ The Dozer component only supports producer endpoints.
 dozer:endpointId[?options]
 --------------------------
 
-Where *endpointId* is a name used to uniquely identify the Dozer
-endpoint configuration. 
+Where *endpointId* is a name used to uniquely identify the Dozer
+endpoint configuration. 
 
 An example Dozer endpoint URI:
 
@@ -139,18 +139,18 @@ The component supports 3 options, which are listed below.
 
 Dozer does not support non-Java sources and targets for mappings, so it
 cannot, for example, map an XML document to a Java object on its own.
- Luckily, Camel has extensive support for marshalling between Java and a
+ Luckily, Camel has extensive support for marshalling between Java and a
 wide variety of formats using
-http://camel.apache.org/data-format.html[data formats].  The Dozer
+http://camel.apache.org/data-format.html[data formats].  The Dozer
 component takes advantage of this support by allowing you to specify
 that input and output data should be passed through a data format prior
-to processing via Dozer.  You can always do this on your own outside the
+to processing via Dozer.  You can always do this on your own outside the
 call to Dozer, but supporting it directly in the Dozer component allows
 you to use a single endpoints to configure any-to-any transformation
 within Camel.
 
 As an example, let's say you wanted to map between an XML data structure
-and a JSON data structure using the Dozer component.  If you had the
+and a JSON data structure using the Dozer component.  If you had the
 following data formats defined in a Camel Context:
 
 [source,xml]
@@ -172,17 +172,17 @@ using a JAXB data format and marshal the mapping output using Jackson.
 == Configuring Dozer
 
 All Dozer endpoints require a Dozer mapping configuration file which
-defines mappings between source and target objects.  The component will
+defines mappings between source and target objects.  The component will
 default to a location of META-INF/dozerBeanMapping.xml if the
 mappingFile or mappingConfiguration options are not specified on an
-endpoint.  If you need to supply multiple mapping configuration files
+endpoint.  If you need to supply multiple mapping configuration files
 for a single endpoint or specify additional configuration options (e.g.
 event listeners, custom converters, etc.), then you can use an instance
-of `org.apache.camel.converter.dozer.DozerBeanMapperConfiguration`.
+of `org.apache.camel.converter.dozer.DozerBeanMapperConfiguration`.
 
 [source,xml]
 ------------------------------------------------------------------------------------------
-<bean id="mapper" class="org.apache.camel.converter.dozer.DozerBeanMapperConfiguration">  
+<bean id="mapper" class="org.apache.camel.converter.dozer.DozerBeanMapperConfiguration">  
   <property name="mappingFiles">
     <list>
       <value>mapping1.xml</value>
@@ -195,16 +195,16 @@ of `org.apache.camel.converter.dozer.DozerBeanMapperConfiguration`.
 == Mapping Extensions
 
 The Dozer component implements a number of extensions to the Dozer
-mapping framework as custom converters.  These converters implement
+mapping framework as custom converters.  These converters implement
 mapping functions that are not supported directly by Dozer itself.
 
 === Variable Mappings
 
 Variable mappings allow you to map the value of a variable definition
 within a Dozer configuration into a target field instead of using the
-value of a source field.  This is equivalent to constant mapping in
+value of a source field.  This is equivalent to constant mapping in
 other mapping frameworks, where can you assign a literal value to a
-target field.  To use a variable mapping, simply define a variable
+target field.  To use a variable mapping, simply define a variable
 within your mapping configuration and then map from the VariableMapper
 class into your target field of choice:
 
@@ -232,7 +232,7 @@ class into your target field of choice:
 === Custom Mappings
 
 Custom mappings allow you to define your own logic for how a source
-field is mapped to a target field.  They are similar in function to
+field is mapped to a target field.  They are similar in function to
 Dozer customer converters, with two notable differences:
 
 * You can have multiple converter methods in a single class with custom
@@ -241,7 +241,7 @@ mappings.
 custom mappings.
 
 A custom mapping is declared by using the built-in '_customMapping'
-converter in your mapping configuration.  The parameter to this
+converter in your mapping configuration.  The parameter to this
 converter has the following syntax:
 
 [source,shell]
@@ -250,7 +250,7 @@ converter has the following syntax:
 --------------------------
 
 Method name is optional - the Dozer component will search for a method
-that matches the input and output types required for a mapping.  An
+that matches the input and output types required for a mapping.  An
 example custom mapping and configuration are provided below.
 
 [source,java]
@@ -260,7 +260,7 @@ public class CustomMapper {
     public Object mapCustomer(String customerId) {
         return "[" + customerId + "]";
     }
-} 
+} 
 --------------------------------------------------
 
 [source,xml]
@@ -285,10 +285,10 @@ public class CustomMapper {
 Expression mappings allow you to use the powerful
 http://camel.apache.org/languages.html[language] capabilities of Camel
 to evaluate an expression and assign the result to a target field in a
-mapping.  Any language that Camel supports can be used in an expression
-mapping.  Basic examples of expressions include the ability to map a
+mapping.  Any language that Camel supports can be used in an expression
+mapping.  Basic examples of expressions include the ability to map a
 Camel message header or exchange property to a target field or to
-concatenate multiple source fields into a target field.  The syntax of a
+concatenate multiple source fields into a target field.  The syntax of a
 mapping expression is:
 
 [source,shell]
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index 9361be4..2c421e9 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.14*
 
 The Dropbox component allows you to treat
-https://www.dropbox.com[Dropbox] remote folders as a producer or
+https://www.dropbox.com[Dropbox] remote folders as a producer or
 consumer of messages. Using the
 http://dropbox.github.io/dropbox-sdk-java/api-docs/v1.7.x/[Dropbox Java
 Core API] (reference version for this component is 1.7.x), this camel
@@ -12,7 +12,7 @@ component has the following features:
 
 * As a consumer, download files and search files by queries
 * As a producer, download files, move files between remote directories,
-delete files/dir, upload files and search files by queries
+delete files/dir, upload files and search files by queries
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -59,11 +59,11 @@ the specific operation.
 
 == Options
 
-In order to work with Dropbox API you need to obtain an *accessToken*
+In order to work with Dropbox API you need to obtain an *accessToken*
 and a *clientIdentifier.* +
 You can refer to the
 https://www.dropbox.com/developers/core/start/java[Dropbox
-documentation] that explains how to get them.  
+documentation] that explains how to get them.  
 
 // component options: START
 The Dropbox component supports 2 options, which are listed below.
@@ -448,4 +448,4 @@ Dropbox documentation,
 
 
 
- 
+ 
diff --git a/components/camel-ehcache/src/main/docs/ehcache-component.adoc b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
index 7aebc94..25e40bc 100644
--- a/components/camel-ehcache/src/main/docs/ehcache-component.adoc
+++ b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
@@ -3,16 +3,16 @@
 
 *Available as of Camel version 2.18*
 
-The Ehcache component enables you to perform caching operations using
+The Ehcache component enables you to perform caching operations using
 Ehcache 3 as the Cache Implementation.
 
 This component supports producer and event based consumer endpoints.
 
 The Cache consumer is an event based consumer and can be used to listen
-and respond to specific cache activities. 
+and respond to specific cache activities. 
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -32,7 +32,7 @@ ehcache://cacheName[?options]
 -----------------------------
 
 You can append query options to the URI in the following
-format, `?option=value&option=#beanRef&...`
+format, `?option=value&option=#beanRef&...`
 
 == Options
 
@@ -158,9 +158,9 @@ The component supports 26 options, which are listed below.
 
 
 
-=== Message Headers Camel 
+=== Message Headers Camel 
 
- 
+ 
 [width="100%",cols="10%,10%,80%",options="header",]
 |=======================================================================
 |Header |Type |Description
@@ -209,7 +209,7 @@ from("direct:in")
     .to("mock:out");
 ------------------------------------------------------------------------------------------------
 
- 
+ 
 
 == Ehcache based aggregation repository example:
 
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index b0877a8..8519818 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -161,11 +161,11 @@ body
 |DeleteIndex |*String* or *DeleteRequest* index name of the index to delete |Deletes the specified indexName and returns a status code the
 body
 
-|BulkIndex | a *List*, *BulkRequest*, or *Collection* of any type that is already accepted
-(XContentBuilder, Map, byte[], String) |Adds content to an index and return a List of the id of the
+|BulkIndex | a *List*, *BulkRequest*, or *Collection* of any type that is already accepted
+(XContentBuilder, Map, byte[], String) |Adds content to an index and return a List of the id of the
 successfully indexed documents in the body
 
-|Bulk |a *List*, *BulkRequest*, or *Collection* of any type that is already accepted
+|Bulk |a *List*, *BulkRequest*, or *Collection* of any type that is already accepted
        (XContentBuilder, Map, byte[], String) |Adds content to an index and returns the BulkItemResponse[]
 object in the body
 
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index ab1ba1a..d4756ec 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -5,7 +5,7 @@
 
 The ELSQL component is an extension to the existing
 xref:sql-component.adoc[SQL Component] that uses
-https://github.com/OpenGamma/ElSql[ElSql] to define the SQL queries. 
+https://github.com/OpenGamma/ElSql[ElSql] to define the SQL queries. 
 
 This component uses `spring-jdbc` behind the scenes for the actual SQL
 handling.
@@ -34,13 +34,13 @@ sql:elSqlName:resourceUri[?options]
 ----
 
 You can append query options to the URI in the following
-format, `?option=value&option=value&...`
+format, `?option=value&option=value&...`
 
 The parameters to the SQL queries are named parameters in the elsql
-mapping files, and maps to corresponding keys from the Camel message, in
+mapping files, and maps to corresponding keys from the Camel message, in
 the given precedence:
 
-1. from message body if xref:manual::simple-language.adoc[Simple]
+1. from message body if xref:manual::simple-language.adoc[Simple]
 expression.
 
 2. from message body if its a `java.util.Map`
@@ -186,11 +186,11 @@ For `select` operations, the result is an instance of
 JdbcTemplate.queryForList() method. For `update` operations, the result
 is the number of updated rows, returned as an `Integer`.
 
-By default, the result is placed in the message body.  If the
-outputHeader parameter is set, the result is placed in the header.  This
+By default, the result is placed in the message body.  If the
+outputHeader parameter is set, the result is placed in the header.  This
 is an alternative to using a full message enrichment pattern to add
 headers, it provides a concise syntax for querying a sequence or some
-other small value into a header.  It is convenient to use outputHeader
+other small value into a header.  It is convenient to use outputHeader
 and outputType together:
 
 == Header values
@@ -252,7 +252,7 @@ parameters will be taken from the body.
 
 In from Camel 2.16.1 onwards you can use Simple expressions as well,
 which allows to use an OGNL like notation on the message body, where it
-assumes to have `getLicense` and `getMinimum` methods:
+assumes to have `getLicense` and `getMinimum` methods:
 
 [source,sql]
 ----
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index ea43cc1..bc69d93 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -347,8 +347,8 @@ facebook4j.PostUpdate body.
         .to("facebook://postFeed/inBody=postUpdate);
 ----------------------------------------------------
 
-To poll, every 5 sec (You can set the xref:manual::polling-consumer.adoc[polling
-consumer] options by adding a prefix of "consumer"), all statuses on
+To poll, every 5 sec (You can set the xref:manual::polling-consumer.adoc[polling
+consumer] options by adding a prefix of "consumer"), all statuses on
 your home feed:
 
 [source,java]
diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc
index 56962cc..9eb6da0 100644
--- a/components/camel-file/src/main/docs/file-component.adoc
+++ b/components/camel-file/src/main/docs/file-component.adoc
@@ -237,7 +237,7 @@ point in time the file is still located in the `inbox` folder. After the
 bean completes, and thus the route is completed, the file consumer will
 perform the move operation and move the file to the `.done` sub-folder.
 
-The *move* and the *preMove* options are considered as a directory name
+The *move* and the *preMove* options are considered as a directory name
 (though if you use an expression such as xref:manual::file-language.adoc[File Language], or xref:manual::simple-language.adoc[Simple] then the result of the expression
 evaluation is the file name to be used - eg if you set
 
@@ -283,7 +283,7 @@ processed and after it's processed, it's moved to the `.done` folder.
 == Fine grained control over Move and PreMove option
 
 The *move* and *preMove* options
-are Expression-based, so we have the full power of
+are Expression-based, so we have the full power of
 the xref:manual::file-language.adoc[File Language] to do advanced configuration
 of the directory and name pattern. +
  Camel will, in fact, internally convert the directory name you enter
@@ -378,7 +378,7 @@ This component implements the Batch Consumer.
 
 == Exchange Properties, file consumer only
 
-As the file consumer implements the `BatchConsumer` it supports batching
+As the file consumer implements the `BatchConsumer` it supports batching
 the files it polls. By batching we mean that Camel will add the
 following additional properties to the Exchange, so
 you know the number of files polled, the current index, and whether the
@@ -795,9 +795,9 @@ Sometime you need to temporarily write the files to some directory
 relative to the destination directory. Such situation usually happens
 when some external process with limited filtering capabilities is
 reading from the directory you are writing to. In the example below
-files will be written to the  `/var/myapp/filesInProgress` directory and
+files will be written to the  `/var/myapp/filesInProgress` directory and
 after data transfer is done, they will be atomically moved to
-the` /var/myapp/finalDirectory `directory.
+the` /var/myapp/finalDirectory `directory.
 
 [source,java]
 ----
@@ -1080,7 +1080,7 @@ sortBy=file:modified;file:name
 Now there is an issue here, can you spot it? Well the modified timestamp
 of the file is too fine as it will be in milliseconds, but what if we
 want to sort by date only and then subgroup by name? +
- Well as we have the true power of xref:manual::file-language.adoc[File Language] we can use its date command that supports patterns. So this
+ Well as we have the true power of xref:manual::file-language.adoc[File Language] we can use its date command that supports patterns. So this
 can be solved as:
 
 [source]
diff --git a/components/camel-flink/src/main/docs/flink-component.adoc b/components/camel-flink/src/main/docs/flink-component.adoc
index 9007221..eabaa9a 100644
--- a/components/camel-flink/src/main/docs/flink-component.adoc
+++ b/components/camel-flink/src/main/docs/flink-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.18*
 
 This documentation page covers the https://flink.apache.org[Apache Flink]
-component for the Apache Camel. The *camel-flink* component provides a
+component for the Apache Camel. The *camel-flink* component provides a
 bridge between Camel connectors and Flink tasks. +
 This Camel Flink connector provides a way to route message from various
 transports, dynamically choosing a flink task to execute, use incoming
@@ -12,7 +12,7 @@ message as input data for the task and finally deliver the results back to
 the Camel pipeline.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
diff --git a/components/camel-fop/src/main/docs/fop-component.adoc b/components/camel-fop/src/main/docs/fop-component.adoc
index 7f8ee97..4884543 100644
--- a/components/camel-fop/src/main/docs/fop-component.adoc
+++ b/components/camel-fop/src/main/docs/fop-component.adoc
@@ -149,7 +149,7 @@ loaded from file system.
 
 fopFactory
 
- 
+ 
 
 Allows to use a custom configured or implementation of
 `org.apache.fop.apps.FopFactory`.
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index abd50c9..ca33797 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -40,10 +40,10 @@ Where *directoryname* represents the underlying directory. The directory
 name is a relative path. Absolute path's is *not* supported. The
 relative path can contain nested folders, such as /inbox/us.
 
-The `autoCreate` option is supported. When consumer
+The `autoCreate` option is supported. When consumer
 starts, before polling is scheduled, there's additional FTP operation
 performed to create the directory configured for endpoint. The default
-value for `autoCreate` is `true`.
+value for `autoCreate` is `true`.
 
 If no *username* is provided, then `anonymous` login is attempted using
 no password. +
@@ -286,7 +286,7 @@ from("ftp://foo@myserver?password=secret&ftpClient.dataTimeout=30000&ftpClientCo
 You can have as many of these options as you like.
 
 See the documentation of the Apache Commons FTP FTPClientConfig for
-possible options and more details. And as well for Apache Commons FTP
+possible options and more details. And as well for Apache Commons FTP
 FTPClient.
 
 If you do not like having many and long configuration in the url you can
diff --git a/components/camel-ganglia/src/main/docs/ganglia-component.adoc b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
index 0e83215..361e085 100644
--- a/components/camel-ganglia/src/main/docs/ganglia-component.adoc
+++ b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
@@ -4,25 +4,25 @@
 *Available as of Camel version 2.15*
 
 Provides a mechanism to send a value (the message body) as a metric to
-the http://ganglia.info[Ganglia] monitoring system.  Uses the gmetric4j
-library.  Can be used in conjunction with standard
+the http://ganglia.info[Ganglia] monitoring system.  Uses the gmetric4j
+library.  Can be used in conjunction with standard
 http://ganglia.info[Ganglia] and
 https://github.com/ganglia/jmxetric[JMXetric] for monitoring metrics
 from the OS, JVM and business processes through a single platform.
 
 You should have a Ganglia gmond agent running on the machine where your
-JVM runs.  The gmond sends a heartbeat to the Ganglia infrastructure,
+JVM runs.  The gmond sends a heartbeat to the Ganglia infrastructure,
 camel-ganglia can't send the heartbeat itself currently.
 
 On most Linux systems (Debian, Ubuntu, Fedora and RHEL/CentOS with EPEL)
 you can just install the Ganglia agent package and it runs automatically
-using multicast configuration.  You can configure it to use regular UDP
+using multicast configuration.  You can configure it to use regular UDP
 unicast if you prefer.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
 
- 
+ 
 
 [source,xml]
 ----
@@ -165,7 +165,7 @@ Ganglia system.
 
 == Return value / response
 
-Ganglia sends metrics using unidirectional UDP or multicast.  There is
+Ganglia sends metrics using unidirectional UDP or multicast.  There is
 no response or change to the message body.
 
 == Examples
@@ -173,8 +173,8 @@ no response or change to the message body.
 === Sending a String metric
 
 The message body will be converted to a String and sent as a metric
-value.  Unlike numeric metrics, String values can't be charted but
-Ganglia makes them available for reporting.  The os_version string at
+value.  Unlike numeric metrics, String values can't be charted but
+Ganglia makes them available for reporting.  The os_version string at
 the top of every Ganglia host page is an example of a String metric.
 
 [source,java]
diff --git a/components/camel-git/src/main/docs/git-component.adoc b/components/camel-git/src/main/docs/git-component.adoc
index ce079f2..33b436b 100644
--- a/components/camel-git/src/main/docs/git-component.adoc
+++ b/components/camel-git/src/main/docs/git-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.16*
 
-The Git component allows you to work with a generic Git repository. 
+The Git component allows you to work with a generic Git repository. 
 
 [source,xml]
 ------------------------------------------------------------
diff --git a/components/camel-github/src/main/docs/github-component.adoc b/components/camel-github/src/main/docs/github-component.adoc
index b5ca1b3..0701102 100644
--- a/components/camel-github/src/main/docs/github-component.adoc
+++ b/components/camel-github/src/main/docs/github-component.adoc
@@ -4,9 +4,9 @@
 *Available as of Camel version 2.15*
 
 The GitHub component interacts with the GitHub API by
-encapsulating http://org.eclipse.egit.github.core[egit-github]. It
+encapsulating http://org.eclipse.egit.github.core[egit-github]. It
 currently provides polling for new pull requests, pull request comments,
-tags, and commits.  It is also able to produce comments on pull
+tags, and commits.  It is also able to produce comments on pull
 requests, as well as close the pull request entirely.
 
 Rather than webhooks, this endpoint relies on simple polling. Reasons
@@ -18,7 +18,7 @@ paging is available in the API)
 * The need to support apps running somewhere not publicly accessible
 where a webhook would fail
 
-Note that the GitHub API is fairly expansive.  Therefore, this component
+Note that the GitHub API is fairly expansive.  Therefore, this component
 could be easily expanded to provide additional interactions.
 
 Maven users will need to add the following dependency to their pom.xml
diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
index 33f1ea5..bb753d8 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.20*
 
 The Google Bigquery component provides access
-to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
+to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
 the https://developers.google.com/api-client-library/java/apis/bigquery/v2[Google Client Services API].
 
 The current implementation does not use gRPC.
diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index dbfd0c4..a8c85da 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.23*
 
 The Google BigQuery SQL component provides access
-to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
+to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
 the https://developers.google.com/apis-explorer/#p/bigquery/v2/bigquery.jobs.query[Google Client Services API].
 
 The current implementation supports only standard SQL
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
index 4305bd7..1d19ba6 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.15*
 
 The Google Calendar component provides access
-to http://google.com/calendar[Google Calendar] via
-the https://developers.google.com/google-apps/calendar/v3/reference/[Google
+to http://google.com/calendar[Google Calendar] via
+the https://developers.google.com/google-apps/calendar/v3/reference/[Google
 Calendar Web APIs].
 
 Google Calendar uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/google-apps/calendar/auth[create an
+to https://developers.google.com/google-apps/calendar/auth[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -205,4 +205,4 @@ All result message bodies utilize objects provided by the underlying
 APIs used by the GoogleCalendarComponent. Producer endpoints can specify
 the option name for incoming message body in the `inBody` endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
-endpoint will map every element to distinct messages.     
+endpoint will map every element to distinct messages.     
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 864ddcc..016b43b 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.23*
 
 The Google Calendar component provides access
-to https://calendar.google.com[Calendar] via
-the https://developers.google.com/calendar/overview[Google Calendar
+to https://calendar.google.com[Calendar] via
+the https://developers.google.com/calendar/overview[Google Calendar
 Web APIs].
 
 Google Calendar uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/calendar/auth[create an
+to https://developers.google.com/calendar/auth[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -175,4 +175,4 @@ from("google-calendar-stream://test?markAsRead=true&delay=5000&maxResults=5").to
 
 This route will consume the next five events starting from the date of polling.
 
-   
+   
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 bb37ba2..0280a39 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
@@ -8,13 +8,13 @@ http://drive.google.com[Google Drive file storage service] via the
 https://developers.google.com/drive/v2/reference[Google Drive Web APIs].
 
 Google Drive uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need to
 https://developers.google.com/drive/web/auth/web-server[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is the
+generating a long-lived refreshToken is the
 https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
@@ -187,7 +187,7 @@ overrides message header, i.e. the endpoint option `inBody=option` would
 override a `CamelGoogleDrive.option` header.
 
 For more information on the endpoints and options see API documentation
-at: https://developers.google.com/drive/v2/reference/[https://developers.google.com/drive/v2/reference/]
+at: https://developers.google.com/drive/v2/reference/[https://developers.google.com/drive/v2/reference/]
 
 == Consumer Endpoints
 
@@ -210,4 +210,4 @@ All result message bodies utilize objects provided by the underlying
 APIs used by the GoogleDriveComponent. Producer endpoints can specify
 the option name for incoming message body in the `inBody` endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
-endpoint will map every element to distinct messages.     
+endpoint will map every element to distinct messages.     
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 3cc3219..c7ff43f 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
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.15*
 
 The Google Mail component provides access
-to http://gmail.com/[Gmail] via
-the https://developers.google.com/gmail/api/v1/reference/[Google Mail
+to http://gmail.com/[Gmail] via
+the https://developers.google.com/gmail/api/v1/reference/[Google Mail
 Web APIs].
 
 Google Mail uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/gmail/api/auth/web-server[create an
+to https://developers.google.com/gmail/api/auth/web-server[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -175,7 +175,7 @@ overrides message header, i.e. the endpoint option `inBody=option` would
 override a `CamelGoogleMail.option` header.
 
 For more information on the endpoints and options see API documentation
-at: https://developers.google.com/gmail/api/v1/reference/[https://developers.google.com/gmail/api/v1/reference/]
+at: https://developers.google.com/gmail/api/v1/reference/[https://developers.google.com/gmail/api/v1/reference/]
 
 == Consumer Endpoints
 
@@ -198,4 +198,4 @@ All result message bodies utilize objects provided by the underlying
 APIs used by the GoogleMailComponent. Producer endpoints can specify the
 option name for incoming message body in the `inBody` endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
-endpoint will map every element to distinct messages.     
+endpoint will map every element to distinct messages.     
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index 4cbd6b0..dfde7b3 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.22*
 
 The Google Mail component provides access
-to http://gmail.com/[Gmail] via
-the https://developers.google.com/gmail/api/v1/reference/[Google Mail
+to http://gmail.com/[Gmail] via
+the https://developers.google.com/gmail/api/v1/reference/[Google Mail
 Web APIs].
 
 Google Mail uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/gmail/api/auth/web-server[create an
+to https://developers.google.com/gmail/api/auth/web-server[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -169,4 +169,4 @@ from("google-mail-stream://test?markAsRead=true&delay=5000&maxResults=5&labels=G
 
 This route will consume unread messages with labels Github and Apache and it will mark the messages as read.
 
-   
+   
diff --git a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
index 0a3e965..51be39e 100644
--- a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
+++ b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.19*
 
 The Google Pubsub component provides access
-to https://cloud.google.com/pubsub/[Cloud Pub/Sub Infrastructure] via
+to https://cloud.google.com/pubsub/[Cloud Pub/Sub Infrastructure] via
 the https://cloud.google.com/apis/docs/client-libraries-explained[Google Client Services API].
 
 The current implementation does not use gRPC.
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 4c3b408..932711e 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
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.23*
 
 The Google Sheets component provides access
-to http://google.com/sheets[Google Sheets] via
-the https://developers.google.com/sheets/api/reference/rest/[Google
+to http://google.com/sheets[Google Sheets] via
+the https://developers.google.com/sheets/api/reference/rest/[Google
 Sheets Web APIs].
 
 Google Sheets uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/google-apps/sheets/auth[create an
+to https://developers.google.com/google-apps/sheets/auth[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -171,7 +171,7 @@ overrides message header, i.e. the endpoint option `inBody=option` would
 override a `CamelGoogleSheets.option` header.
 
 For more information on the endpoints and options see API documentation
-at: https://developers.google.com/sheets/api/reference/rest/[https://developers.google.com/sheets/api/reference/rest/]
+at: https://developers.google.com/sheets/api/reference/rest/[https://developers.google.com/sheets/api/reference/rest/]
 
 == Consumer Endpoints
 
@@ -194,4 +194,4 @@ All result message bodies utilize objects provided by the underlying
 APIs used by the GoogleSheetsComponent. Producer endpoints can specify
 the option name for incoming message body in the `inBody` endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
-endpoint will map every element to distinct messages.     
+endpoint will map every element to distinct messages.     
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 0607955..2e0857c 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -4,19 +4,19 @@
 *Available as of Camel version 2.23*
 
 The Google Sheets component provides access
-to https://sheets.google.com/[Sheets] via
-the https://developers.google.com/sheets/api/reference/rest/[Google Sheets
+to https://sheets.google.com/[Sheets] via
+the https://developers.google.com/sheets/api/reference/rest/[Google Sheets
 Web APIs].
 
 Google Sheets uses
-the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
-protocol] for authenticating a Google account and authorizing access to
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/google-apps/sheets/auth[create an
+to https://developers.google.com/google-apps/sheets/auth[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
-generating a long-lived refreshToken is
-the https://developers.google.com/oauthplayground[OAuth playground].
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -179,4 +179,4 @@ from("google-sheets-stream://data?range=A:B&delay=5000&maxResults=5").to("mock:r
 
 This route will consume the next ten events starting from the date of polling.
 
-   
+   
diff --git a/components/camel-gora/src/main/docs/gora-component.adoc b/components/camel-gora/src/main/docs/gora-component.adoc
index ff34b84..54570cc 100644
--- a/components/camel-gora/src/main/docs/gora-component.adoc
+++ b/components/camel-gora/src/main/docs/gora-component.adoc
@@ -13,10 +13,10 @@ for this component:
 [source,xml]
 ---------------------------------------------------------
 <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-gora</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-gora</artifactId>
  <!-- use the same version as your Camel core version -->
- <version>x.x.x</version>
+ <version>x.x.x</version>
 </dependency>
 ---------------------------------------------------------
 
@@ -231,7 +231,7 @@ datastore._
 [source,xml]
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 <setHeader name="GoraOperation">
- <constant>CreateSchema</constant>
+ <constant>CreateSchema</constant>
 </setHeader>
 <to uri="gora:foobar?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -241,9 +241,9 @@ datastore._
 [source,xml]
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 <setHeader name="GoraOperation">
- <constant>SchemaExists</constant>
+ <constant>SchemaExists</constant>
 </setHeader>
- <to uri="gora:foobar?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
+ <to uri="gora:foobar?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 *Put* _(XML DSL)_:
@@ -251,10 +251,10 @@ datastore._
 [source,xml]
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 <setHeader name="GoraOperation">
- <constant>put</constant>
+ <constant>put</constant>
 </setHeader>
 <setHeader name="GoraKey">
- <constant>22222</constant>
+ <constant>22222</constant>
 </setHeader>
 <to uri="gora:foo?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -264,10 +264,10 @@ datastore._
 [source,xml]
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 <setHeader name="GoraOperation">
- <constant>GET</constant>
+ <constant>GET</constant>
 </setHeader>
 <setHeader name="GoraKey">
- <constant>10101</constant>
+ <constant>10101</constant>
 </setHeader>
 <to uri="gora:bar?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -277,10 +277,10 @@ datastore._
 [source,xml]
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 <setHeader name="GoraOperation">
- <constant>DELETE</constant>
+ <constant>DELETE</constant>
 </setHeader>
 <setHeader name="GoraKey">
- <constant>22222</constant>
+ <constant>22222</constant>
 </setHeader>
 <to uri="gora:bar?keyClass=java.lang.Long&amp;valueClass=org.apache.camel.component.gora.generated.Pageview&amp;dataStoreClass=org.apache.gora.hbase.store.HBaseStore"/>
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-grape/src/main/docs/grape-component.adoc b/components/camel-grape/src/main/docs/grape-component.adoc
index 44cf763..e7a267f 100644
--- a/components/camel-grape/src/main/docs/grape-component.adoc
+++ b/components/camel-grape/src/main/docs/grape-component.adoc
@@ -132,12 +132,12 @@ By default Camel Grape component operates on the String payloads:
 producerTemplate.sendBody("grape:defaultMavenCoordinates", "org.apache.camel/camel-ftp/2.15.2");
 ------------------------------------------------------------------------------------------------
 
-But of course Camel build-in xref:manual::type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into the
 String:
 
- 
+ 
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------
@@ -167,9 +167,9 @@ template.sendBody("grape:grape", "org.apache.camel/camel-stream/2.15.2");
 template.sendBody("stream:out", "msg");
 -------------------------------------------------------------------------
 
-== Loading processors bean at runtime
+== Loading processors bean at runtime
 
-In order to load the new processor bean  with your custom business login
+In order to load the new processor bean  with your custom business login
 at the router runtime, just grab the jar containing the required bean:
 
 [source,java]
@@ -180,7 +180,7 @@ int productId = 1;
 int price = template.requestBody("bean:com.example.PricingBean?method=currentProductPrice", productId, int.class)
 -----------------------------------------------------------------------------------------------------------------
 
- 
+ 
 
 == Loading deployed jars after Camel context restart
 
@@ -188,40 +188,40 @@ After you download new jar, you usually would like to have it loaded by
 the Camel again after the restart of the `CamelContext`. It is certainly
 possible, as Grape component keeps track of the jar files you have
 installed. In order to load again the installed jars on the context
-startup, use the `GrapeEndpoint.loadPatches()` method in your route: 
+startup, use the `GrapeEndpoint.loadPatches()` method in your route: 
 
- 
+ 
 
 [source,java]
 -------------------------------------------------------------------------
 import static org.apache.camel.component.grape.GrapeEndpoint.loadPatches;
 
-... 
+... 
 camelContext.addRoutes(
-  new RouteBuilder() { 
-    @Override 
-    public void configure() throws Exception { 
+  new RouteBuilder() { 
+    @Override 
+    public void configure() throws Exception { 
       loadPatches(camelContext);
- 
+ 
       from("direct:loadCamelFTP").
-        to("grape:org.apache.camel/camel-ftp/2.15.2"); 
+        to("grape:org.apache.camel/camel-ftp/2.15.2"); 
     }
   });
 -------------------------------------------------------------------------
 
- 
+ 
 
 == Managing the installed jars
 
 If you would like to check what jars have been installed into the given
 `CamelContext`, send message to the grape endpoint with
-the `CamelGrapeCommand` header set to `GrapeCommand.listPatches`:
+the `CamelGrapeCommand` header set to `GrapeCommand.listPatches`:
 
 [source,java]
 ----------------------------------------------------------------------------------------
       from("netty-http:http://0.0.0.0:80/patches").
         setHeader(GrapeConstats.GRAPE_COMMAND, constant(CamelGrapeCommand.listPatches)).
-        to("grape:list"); 
+        to("grape:list"); 
 ----------------------------------------------------------------------------------------
 
 Connecting the to the route defined above using the HTTP client returns
@@ -235,14 +235,14 @@ grape:org.apache.camel/camel-jms/2.15.2
 ---------------------------------------
 
 If you would like to remove the installed jars, so these won't be loaded
-again after the context restart, use the `GrapeCommand.``clearPatches`
+again after the context restart, use the `GrapeCommand.``clearPatches`
 command:
 
 [source,java]
 -----------------------------------------------------------------------------------------
       from("netty-http:http://0.0.0.0:80/patches").
         setHeader(GrapeConstats.GRAPE_COMMAND, constant(CamelGrapeCommand.clearPatches)).
-        setBody().constant("Installed patches have been deleted."); 
+        setBody().constant("Installed patches have been deleted."); 
 -----------------------------------------------------------------------------------------
 
 == See Also
diff --git a/components/camel-groovy/src/main/docs/groovy-language.adoc b/components/camel-groovy/src/main/docs/groovy-language.adoc
index dd5e0fa..0874fcc 100644
--- a/components/camel-groovy/src/main/docs/groovy-language.adoc
+++ b/components/camel-groovy/src/main/docs/groovy-language.adoc
@@ -70,14 +70,14 @@ The component supports 2 options, which are listed below.
 
 Sometimes you may need to use custom `GroovyShell` instance in your
 Groovy expressions. To provide custom `GroovyShell`, add implementation
-of the `org.apache.camel.language.groovy.GroovyShellFactory` SPI
+of the `org.apache.camel.language.groovy.GroovyShellFactory` SPI
 interface to your Camel registry. For example after adding the following
 bean to your Spring context...
 
 [source,java]
 ----------------------------------------------------------------------
 public class CustomGroovyShellFactory implements GroovyShellFactory {
- 
+ 
   public GroovyShell createGroovyShell(Exchange exchange) {
     ImportCustomizer importCustomizer = new ImportCustomizer();
     importCustomizer.addStaticStars("com.example.Utils");
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
index 7e0a3481..01ff469 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
@@ -149,7 +149,7 @@ from("direct:removevalue")
 .toF("hazelcast-%sbar", HazelcastConstants.LIST_PREFIX);
 --------------------------------------------------------------------------------------------
 
-Note that *CamelHazelcastObjectIndex* header is used for indexing
+Note that *CamelHazelcastObjectIndex* header is used for indexing
 purpose.
 
 
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
index 70ddf1b..1d026c9 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
@@ -123,7 +123,7 @@ Header Variables for the request message:
 |`CamelHazelcastObjectId` |`String` | the object id to store / find your object inside the cache
 |=======================================================================
 
-=== Sample for *put*:
+=== Sample for *put*:
 
 Java DSL:
 
@@ -148,7 +148,7 @@ Spring DSL:
 </route>
 -----------------------------------------------------------------------------------------------
 
-=== Sample for *get*:
+=== Sample for *get*:
 
 Java DSL:
 
@@ -175,7 +175,7 @@ Spring DSL:
 </route>
 -----------------------------------------------------------------------------------------------
 
-=== Sample for *delete*:
+=== Sample for *delete*:
 
 Java DSL:
 
@@ -211,7 +211,7 @@ template.sendBodyAndHeader("direct:[put|get|delete|clear]", "my-foo", HazelcastC
 
 For the multimap cache this component provides the same listeners /
 variables as for the map cache consumer (except the update and enviction
-listener). The only difference is the *multimap* prefix inside the URI.
+listener). The only difference is the *multimap* prefix inside the URI.
 Here is a sample:
 
 [source,java]
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
index ab0442e..d0b1aa9 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.16*
 
 The http://www.hazelcast.com/[Hazelcast] ringbuffer component is one of Camel Hazelcast Components which allows you to access Hazelcast ringbuffer.
-Ringbuffer is a distributed data structure where the data is stored in a ring-like structure. You can think of it as a circular array with a certain capacity. 
+Ringbuffer is a distributed data structure where the data is stored in a ring-like structure. You can think of it as a circular array with a certain capacity. 
 
 == Options
 
@@ -118,7 +118,7 @@ Header Variables for the request message:
 |`CamelHazelcastObjectId` |`String` |the object id to store / find your object inside the cache
 |=======================================================================
 
-=== Sample for *put*:
+=== Sample for *put*:
 
 Java DSL:
 
@@ -143,7 +143,7 @@ Spring DSL:
 </route>
 -----------------------------------------------------------------------------------------------
 
-=== Sample for *readonce from head*:
+=== Sample for *readonce from head*:
 
 Java DSL:
 
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
index 760b1c5..503716c 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
@@ -109,7 +109,7 @@ The component supports 9 options, which are listed below.
 
 The topic producer provides only one operation (publish).
 
-=== Sample for *publish*:
+=== Sample for *publish*:
 
 [source,java]
 ----------------------------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast.adoc b/components/camel-hazelcast/src/main/docs/hazelcast.adoc
index 0ecae42..89646cd 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast.adoc
@@ -40,8 +40,8 @@ See followings for each component usage:
 * xref:hazelcast-set-component.adoc[set]
 * xref:hazelcast-atomicvalue-component.adoc[atomic number]
 * xref:hazelcast-instance-component.adoc[cluster support (instance)]
-* xref:hazelcast-replicatedmap-component.adoc[replicatedmap] 
-* xref:hazelcast-ringbuffer-component.adoc[ringbuffer] 
+* xref:hazelcast-replicatedmap-component.adoc[replicatedmap] 
+* xref:hazelcast-ringbuffer-component.adoc[ringbuffer] 
 
 
 
@@ -121,7 +121,7 @@ to reference the service in the hazelcast endpoint.
 
 === Bundle A create an instance and publishes it as an OSGI service
 
- 
+ 
 
 [source,xml]
 --------------------------------------------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/main/docs/hdfs-component.adoc b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
index d2a5d8d..b951750 100644
--- a/components/camel-hdfs/src/main/docs/hdfs-component.adoc
+++ b/components/camel-hdfs/src/main/docs/hdfs-component.adoc
@@ -270,9 +270,9 @@ related to the mechanism Hadoop 2.x uses to discover different
 available filesystem types and implementations. These resources are not
 available when running inside OSGi.
 
-As with `camel-hdfs` component, the default configuration files need to
+As with `camel-hdfs` component, the default configuration files need to
 be visible from the bundle class loader. A typical way to deal with it
-is to keep a copy of `core-default.xml` (and e.g., `hdfs-default.xml`)
+is to keep a copy of `core-default.xml` (and e.g., `hdfs-default.xml`)
 in your bundle root.
 
 === Using this component with manually defined routes
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index d94d65f..8dff8fe 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.15*
 
 The Hipchat component supports producing and consuming messages from/to
-https://www.hipchat.com[Hipchat] service.
+https://www.hipchat.com[Hipchat] service.
 
 *Prerequisites*
 
@@ -140,7 +140,7 @@ from the provided 'consumeUsers' are retrieved and sent as Exchange
 body. If you do not want the same message to be retrieved again when
 there are no new messages on next poll then you can add the
 idempotent consumer as shown below. All
-the options on the ScheduledPollConsumer can
+the options on the ScheduledPollConsumer can
 also be used for more control on the consumer.
 
 [source,java]
@@ -170,7 +170,7 @@ authToken
 |HipchatMessageDate |HipchatConstants.MESSAGE_DATE |_String_ |The date message was sent. The format is ISO-8601 as present in the
 Hipchat https://www.hipchat.com/docs/apiv2/method/view_recent_privatechat_history[response].
 
-|HipchatFromUserResponseStatus |HipchatConstants.FROM_USER_RESPONSE_STATUS  |_http://hc.apache.org/httpcomponents-core-4.2.x/httpcore/apidocs/org/apache/http/StatusLine.html[StatusLine]_
+|HipchatFromUserResponseStatus |HipchatConstants.FROM_USER_RESPONSE_STATUS  |_http://hc.apache.org/httpcomponents-core-4.2.x/httpcore/apidocs/org/apache/http/StatusLine.html[StatusLine]_
 The status of the API response received.
 |=======================================================================
 
@@ -205,7 +205,7 @@ Appropriate headers needs to be set.
 |HipchatMessageFormat |HipchatConstants.MESSAGE_FORMAT |String |Valid formats are 'text' or 'html'. *Default: 'text'*
 
 |HipchatMessageBackgroundColor |HipchatConstants.MESSAGE_BACKGROUND_COLOR |_String_ |Valid color values are 'yellow', 'green', 'red', 'purple', 'gray',
-'random'. *Default: 'yellow' (Room Only)* 
+'random'. *Default: 'yellow' (Room Only)* 
 
 |HipchatTriggerNotification |HipchatConstants.TRIGGER_NOTIFY |_String_ |Valid values are 'true' or 'false'. Whether this message should trigger
 a user notification (change the tab color, play a sound, notify mobile
@@ -258,4 +258,4 @@ Maven users will need to add the following dependency to their pom.xml.
 </dependency>
 ------------------------------------------
 
-where `$\{camel-version\}` must be replaced by the actual version of Camel.
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
diff --git a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
index 6279b9a..6b55962 100644
--- a/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
+++ b/components/camel-hl7/src/main/docs/hl7-dataformat.adoc
@@ -10,7 +10,7 @@ v2 messages] using the http://hl7api.sourceforge.net[HAPI library].
 This component supports the following:
 
 * HL7 MLLP codec for xref:mina-component.adoc[Mina]
-* HL7 MLLP codec for xref:netty-component.adoc[Netty]
+* HL7 MLLP codec for xref:netty-component.adoc[Netty]
 * Type Converter from/to HAPI and String
 * HL7 DataFormat using the HAPI library
 * Even more ease-of-use as it's integrated well with the
@@ -35,9 +35,9 @@ HL7 is often used with the HL7 MLLP protocol, which is a text based TCP
 socket based protocol. This component ships with a Mina and Netty4 Codec
 that conforms to the MLLP protocol so you can easily expose an HL7
 listener accepting HL7 requests over the TCP transport layer. To expose
-a HL7 listener service, the xref:mina-component.adoc[camel-mina] or
+a HL7 listener service, the xref:mina-component.adoc[camel-mina] or
 xref:netty-component.adoc[camel-netty] component is used with the
-`HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
+`HL7MLLPCodec` (mina) or `HL7MLLPNettyDecoder/HL7MLLPNettyEncoder`
 (Netty).
 
 HL7 MLLP codec can be configured as follows:
@@ -167,9 +167,9 @@ the HAPI HL7 model objects, but you can use the plain String objects if
 you prefer, for instance if you wish to parse the data yourself.
 
 You can also let both the Mina and Netty codecs use a
-plain `byte[]` as its data format by setting the `produceString`
+plain `byte[]` as its data format by setting the `produceString`
 property to false. The Type Converter is also capable of converting
-the `byte[]` to/from HAPI HL7 model objects.
+the `byte[]` to/from HAPI HL7 model objects.
 
 == HL7v2 Model using HAPI
 
@@ -306,13 +306,13 @@ separators anymore by converting `\n` to `\r`. If you  +
 === Charset
 
 Both `marshal and unmarshal` evaluate the charset
-provided in the field `MSH-18`. If this field is empty, by default the
+provided in the field `MSH-18`. If this field is empty, by default the
 charset contained in the corresponding Camel charset property/header is
 assumed. You can even change this default behavior by overriding the
 `guessCharsetName` method when inheriting from the `HL7DataFormat`
 class.
 
- 
+ 
 
 There is a shorthand syntax in Camel for well-known data formats that
 are commonly used. Then you don't need to create an instance of the `HL7DataFormat`
@@ -367,7 +367,7 @@ that was used to parse the message`
 |`CamelHL7Charset` |`MSH-18` |`UNICODE UTF-8`
 |===
 
-All headers except `CamelHL7Context `are `String` types. If a header
+All headers except `CamelHL7Context `are `String` types. If a header
 value is missing, its value is `null`.
 
 == Dependencies
diff --git a/components/camel-hl7/src/main/docs/hl7terser-language.adoc b/components/camel-hl7/src/main/docs/hl7terser-language.adoc
index 769040f..4cfe773 100644
--- a/components/camel-hl7/src/main/docs/hl7terser-language.adoc
+++ b/components/camel-hl7/src/main/docs/hl7terser-language.adoc
@@ -36,7 +36,7 @@ The HL7 Terser language supports 1 options, which are listed below.
       .setHeader("PATIENT_ID", hl7terser("QRD-8(0)-1"))
       .to("mock:test1");
 
-   // continue processing if extracted field equals a message header
+   // continue processing if extracted field equals a message header
    from("direct:test2")
       .filter(hl7terser("QRD-8(0)-1").isEqualTo(header("PATIENT_ID"))
       .to("mock:test2");
diff --git a/components/camel-http/src/main/docs/http-component.adoc b/components/camel-http/src/main/docs/http-component.adoc
index d78b8d3..f6ddcf5 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -252,7 +252,7 @@ body. All headers from the IN message will be copied to the OUT message,
 so headers are preserved during routing. Additionally Camel will add the
 HTTP response headers as well to the OUT message headers.
 
- 
+ 
 
 
 == Using System Properties
@@ -559,9 +559,9 @@ Using the JSSE Configuration Utility
 
 The HTTP component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the HTTP component.
 
 [[HTTP-Programmaticconfigurationofthecomponent]]
diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc
index d88dfcf..d38c955 100644
--- a/components/camel-irc/src/main/docs/irc-component.adoc
+++ b/components/camel-irc/src/main/docs/irc-component.adoc
@@ -151,9 +151,9 @@ The component supports 4 options, which are listed below.
 
 The IRC component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the IRC component.
 
 [[IRC-Programmaticconfigurationoftheendpoint]]
diff --git a/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
index 0485b0f..5938fa5 100644
--- a/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
+++ b/components/camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.16*
 
 Jackson XML is a Data Format which uses the
-http://wiki.fasterxml.com/JacksonHome/[Jackson library] with the
+http://wiki.fasterxml.com/JacksonHome/[Jackson library] with the
 https://github.com/FasterXML/jackson-dataformat-xml[XMLMapper extension]
 to unmarshal an XML payload into Java objects or to marshal Java objects
 into an XML payload.
@@ -103,8 +103,8 @@ ND
 
 === Using Jackson XML in Spring DSL
 
-When using Data Format in Spring DSL you need to
-declare the data formats first. This is done in the *DataFormats* XML
+When using Data Format in Spring DSL you need to
+declare the data formats first. This is done in the *DataFormats* XML
 tag.
 
 [source,xml]
@@ -131,13 +131,13 @@ And then you can refer to this id in the route:
 
 When marshalling a POJO to XML you might want to exclude certain fields
 from the XML output. With Jackson you can
-use http://wiki.fasterxml.com/JacksonJsonViews[JSON views] to accomplish
+use http://wiki.fasterxml.com/JacksonJsonViews[JSON views] to accomplish
 this. First create one or more marker classes.
 
-Use the marker classes with the `@JsonView` annotation to
+Use the marker classes with the `@JsonView` annotation to
 include/exclude certain fields. The annotation also works on getters.
 
-Finally use the Camel `JacksonXMLDataFormat` to marshall the above POJO
+Finally use the Camel `JacksonXMLDataFormat` to marshall the above POJO
 to XML.
 
 Note that the weight field is missing in the resulting XML:
@@ -147,7 +147,7 @@ Note that the weight field is missing in the resulting XML:
 <pojo age="30" weight="70"/>
 ----------------------------
 
-== Include/Exclude fields using the `jsonView` attribute with `JacksonXML`DataFormat
+== Include/Exclude fields using the `jsonView` attribute with `JacksonXML`DataFormat
 
 As an example of using this attribute you can instead of:
 
@@ -158,8 +158,8 @@ from("direct:inPojoAgeView").
   marshal(ageViewFormat);
 ---------------------------------------------------------------------------------------------------
 
-Directly specify your http://wiki.fasterxml.com/JacksonJsonViews[JSON
-view] inside the Java DSL as:
+Directly specify your http://wiki.fasterxml.com/JacksonJsonViews[JSON
+view] inside the Java DSL as:
 
 [source,java]
 ------------------------------------------------------------
@@ -181,7 +181,7 @@ And the same in XML DSL:
 
 If you want to marshal a pojo to XML, and the pojo has some fields with
 null values. And you want to skip these null values, then you need to
-set either an annotation on the pojo, 
+set either an annotation on the pojo, 
 
 [source,java]
 ------------------------------
@@ -214,11 +214,11 @@ Or from XML DSL you configure this as
 
 If you use jackson to unmarshal XML to POJO, then you can now specify a
 header in the message that indicate which class name to unmarshal to. +
-The header has key `CamelJacksonUnmarshalType` if that header is present
+The header has key `CamelJacksonUnmarshalType` if that header is present
 in the message, then Jackson will use that as FQN for the POJO class to
 unmarshal the XML payload as.
 
- For JMS end users there is the JMSType header from the JMS spec that
+ For JMS end users there is the JMSType header from the JMS spec that
 indicates that also. To enable support for JMSType you would need to
 turn that on, on the jackson data format as shown:
 
@@ -237,11 +237,11 @@ Or from XML DSL you configure this as
     </dataFormats>
 -------------------------------------------------------
 
-== Unmarshalling from XML to List<Map> or List<pojo>
+== Unmarshalling from XML to List<Map> or List<pojo>
 
 If you are using Jackson to unmarshal XML to a list of map/pojo, you can
-now specify this by setting `useList="true"` or use
-the `org.apache.camel.component.jacksonxml.ListJacksonXMLDataFormat`.
+now specify this by setting `useList="true"` or use
+the `org.apache.camel.component.jacksonxml.ListJacksonXMLDataFormat`.
 For example with Java you can do as shown below:
 
 [source,java]
@@ -255,7 +255,7 @@ format.setUnmarshalType(MyPojo.class);
 -------------------------------------------------------------
 
 And if you use XML DSL then you configure to use list
-using `useList` attribute as shown below:
+using `useList` attribute as shown below:
 
 [source,java]
 --------------------------------------------
@@ -285,7 +285,7 @@ those using the moduleClassNames option as shown below.
     </dataFormats>
 -----------------------------------------------------------------------------------------------------------------------------------------
 
-When using moduleClassNames then the custom jackson modules are not
+When using moduleClassNames then the custom jackson modules are not
 configured, by created using default constructor and used as-is. If a
 custom module needs any custom configuration, then an instance of the
 module can be created and configured, and then use modulesRefs to refer
@@ -296,13 +296,13 @@ to the module as shown below:
     <bean id="myJacksonModule" class="com.foo.MyModule">
       ... // configure the module as you want
     </bean>
- 
+ 
     <dataFormats>
       <jacksonxml id="jacksonxml" useList="true" unmarshalTypeName="com.foo.MyPojo" moduleRefs="myJacksonModule"/>
     </dataFormats>
 ------------------------------------------------------------------------------------------------------------------
 
- Multiple modules can be specified separated by comma, such as
+ Multiple modules can be specified separated by comma, such as
 moduleRefs="myJacksonModule,myOtherModule"
 
 == Enabling or disable features using Jackson
@@ -340,9 +340,9 @@ df.disableFeature(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES);
 
 == Converting Maps to POJO using Jackson
 
-Jackson `ObjectMapper` can be used to convert maps to POJO objects.
+Jackson `ObjectMapper` can be used to convert maps to POJO objects.
 Jackson component comes with the data converter that can be used to
-convert `java.util.Map` instance to non-String, non-primitive and
+convert `java.util.Map` instance to non-String, non-primitive and
 non-Number objects.
 
 [source,java]
@@ -355,13 +355,13 @@ producerTemplate.sendBody("direct:mapToInvoice", invoiceData);
 Invoice invoice = exchange.getIn().getBody(Invoice.class);
 ----------------------------------------------------------------
 
-If there is a single `ObjectMapper` instance available in the Camel
+If there is a single `ObjectMapper` instance available in the Camel
 registry, it will used by the converter to perform the conversion.
-Otherwise the default mapper will be used.  
+Otherwise the default mapper will be used.  
 
 == Formatted XML marshalling (pretty-printing)
 
-Using the `prettyPrint` option one can output a well formatted XML while
+Using the `prettyPrint` option one can output a well formatted XML while
 marshalling:
 
 [source,java]
@@ -378,9 +378,9 @@ And in Java DSL:
 from("direct:inPretty").marshal().jacksonxml(true);
 ---------------------------------------------------
 
-Please note that there are 5 different overloaded `jacksonxml()` DSL
-methods which support the `prettyPrint` option in combination with other
-settings for `unmarshalType`, `jsonView` etc. 
+Please note that there are 5 different overloaded `jacksonxml()` DSL
+methods which support the `prettyPrint` option in combination with other
+settings for `unmarshalType`, `jsonView` etc. 
 
 == Dependencies
 
diff --git a/components/camel-jasypt/src/main/docs/jasypt.adoc b/components/camel-jasypt/src/main/docs/jasypt.adoc
index 98b28c9..04ba8de 100644
--- a/components/camel-jasypt/src/main/docs/jasypt.adoc
+++ b/components/camel-jasypt/src/main/docs/jasypt.adoc
@@ -213,10 +213,10 @@ Jasypt.
 == Example with Blueprint XML
 
 In Blueprint XML you need to configure
-the `JasyptPropertiesParser` which is shown below. Then the
-Camel xref:properties-component.adoc[Properties] component is told to
-use `jasypt` as the properties parser, which
-means Jasypt has its chance to decrypt values looked
+the `JasyptPropertiesParser` which is shown below. Then the
+Camel xref:properties-component.adoc[Properties] component is told to
+use `jasypt` as the properties parser, which
+means Jasypt has its chance to decrypt values looked
 up in the properties.
 
 [source,xml]
@@ -254,10 +254,10 @@ up in the properties.
 </blueprint>
 ----------------------------------------------------------------------------------------------------------------
 
-The xref:properties-component.adoc[Properties] component can also be inlined
-inside the `<camelContext>` tag which is shown below. Notice how we use
-the `propertiesParserRef` attribute to refer
-to Jasypt.
+The xref:properties-component.adoc[Properties] component can also be inlined
+inside the `<camelContext>` tag which is shown below. Notice how we use
+the `propertiesParserRef` attribute to refer
+to Jasypt.
 
 [source,xml]
 ----------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
index c77aefc..ae5dab0 100644
--- a/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
+++ b/components/camel-jaxb/src/main/docs/jaxb-dataformat.adoc
@@ -171,7 +171,7 @@ marshaling or unmarshaling the message. You can also do it by setting
 the Exchange property
 `Exchange.FILTER_NON_XML_CHARS`.
 
- 
+ 
 [width="100%",cols="30%,10%,60%",options="header",]
 |=======================================================================
 |   | JDK 1.5 | JDK 1.6+
@@ -310,8 +310,8 @@ jaxbDataFormat.setSchemaFactory(thradSafeSchemaFactory);
 
 *Available as of Camel 2.14*
 
-The JAXB Data Format supports to specify the
-SchemaLocation when marshaling the XML. 
+The JAXB Data Format supports to specify the
+SchemaLocation when marshaling the XML. 
 
 Using the Java DSL, you can configure it in the following way:
 
@@ -339,7 +339,7 @@ The JAXB marshaller requires that the message body is JAXB compatible,
 eg its a JAXBElement, eg a java instance that has JAXB annotations, or
 extend JAXBElement. There can be situations where the message body is
 already in XML, eg from a String type. There is a new
-option `mustBeJAXBElement` you can set to false, to relax this check, so
+option `mustBeJAXBElement` you can set to false, to relax this check, so
 the JAXB marshaller only attempts to marshal JAXBElements
 (javax.xml.bind.JAXBIntrospector#isElement returns true). And in those
 situations the marshaller fallbacks to marshal the message body as-is.
diff --git a/components/camel-jbpm/src/main/docs/jbpm-component.adoc b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
index 35351d3..158d01d 100644
--- a/components/camel-jbpm/src/main/docs/jbpm-component.adoc
+++ b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
@@ -320,4 +320,4 @@ from("direct:start")
 * Endpoint
 * Getting Started
 
- 
+ 
diff --git a/components/camel-jcr/src/main/docs/jcr-component.adoc b/components/camel-jcr/src/main/docs/jcr-component.adoc
index c2493af..bbdbe12 100644
--- a/components/camel-jcr/src/main/docs/jcr-component.adoc
+++ b/components/camel-jcr/src/main/docs/jcr-component.adoc
@@ -144,7 +144,7 @@ from("direct:a").setHeader(JcrConstants.JCR_NODE_NAME, constant("node"))
     .to("jcr://user:pass@repository/home/test");
 ------------------------------------------------------------------------
 
- 
+ 
 
 The following code will register an EventListener under the path
 import-application/inbox for Event.NODE_ADDED and Event.NODE_REMOVED
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 81706a7..e45e937 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -9,7 +9,7 @@ behaves as a simple Web server.
 
 *Stream*
 
-The `assert` call appears in this example, because the code is part of
+The `assert` call appears in this example, because the code is part of
 an unit test.Jetty is stream based, which means the input it receives is
 submitted to Camel as a stream. That means you will only be able to read
 the content of the stream *once*. +
@@ -282,7 +282,7 @@ Jetty component will copy the HTTP request parameter, `one` to the
 exchange's `in.header`. We can then use the `simple` language to route
 exchanges that contain this header to a specific endpoint and all others
 to another. If we used a language more powerful than
-xref:manual::simple-language.adoc[Simple] (such as xref:ognl-language.adoc[OGNL])
+xref:manual::simple-language.adoc[Simple] (such as xref:ognl-language.adoc[OGNL])
 we could also test for the parameter value and do routing based on the
 header value as well.
 
@@ -326,9 +326,9 @@ Using the JSSE Configuration Utility
 
 The Jetty component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the Jetty component.
 
 [[Jetty-Programmaticconfigurationofthecomponent]]
@@ -490,7 +490,7 @@ return the address of the Apache proxy.
 
 Jetty has a forwarded property which takes the value from
 X-Forwarded-For and places it in the HttpServletRequest remoteAddr
-property.  This property is not available directly through the endpoint
+property.  This property is not available directly through the endpoint
 configuration but it can be easily added using the socketConnectors
 property:
 
diff --git a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
index b5aeb1f..61fd159 100644
--- a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
+++ b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
@@ -15,7 +15,7 @@ for this component.
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-jgroups-raft</artifactId>
     <!-- use the same version as your Camel core version -->
-    <version>x.y.z</version>
+    <version>x.y.z</version>
 </dependency>
 ------------------------------------------------------------
 
@@ -153,7 +153,7 @@ The component supports 12 options, which are listed below.
 
 |`JGROUPSRAFT_SET_TIMEUNIT` |`JGroupsRaftEndpoint.`HEADER_JGROUPSRAFT_SET_TIMEUNIT` | *Producer*: Timeunit to be used in set() operation.
 |=======================================================================
- 
+ 
 == Usage
 
 Using `jgroups-raft` component with `enableRoleChangeEvents=true` on the consumer side of the route will capture
@@ -182,7 +182,7 @@ from("direct:start").to("jgroups-raft:clusterName");
 === Receive cluster view change notifications
 
 The snippet below demonstrates how to create the consumer endpoint
-listening to the change role events. By default this option is off.
+listening to the change role events. By default this option is off.
 
 [source,java]
 ---------------------------------------------------------------------
@@ -209,5 +209,5 @@ service.setJgroupsClusterName("clusterName");
 ...
 context.addService(service);
 
-from("master:mycluster:jetty:http://localhost:8080/orders").to("jms:orders"); 
+from("master:mycluster:jetty:http://localhost:8080/orders").to("jms:orders"); 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-jgroups/src/main/docs/jgroups-component.adoc b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
index 5cdc5f8..83642ef 100644
--- a/components/camel-jgroups/src/main/docs/jgroups-component.adoc
+++ b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
@@ -16,7 +16,7 @@ for this component.
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-jgroups</artifactId>
     <!-- use the same version as your Camel core version -->
-    <version>x.y.z</version>
+    <version>x.y.z</version>
 </dependency>
 ------------------------------------------------------------
 
@@ -150,7 +150,7 @@ consumed message has been extracted.
 |`JGROUPS_CHANNEL_ADDRESS` |`JGroupsEndpoint.`HEADER_JGROUPS_CHANNEL_ADDRESS |Address (`org.jgroups.Address`) of the channel associated with the
 endpoint.
 |=======================================================================
- 
+ 
 == Usage
 
 Using `jgroups` component on the consumer side of the route will capture
@@ -230,9 +230,9 @@ import static org.apache.camel.component.jgroups.JGroupsFilters.dropNonCoordinat
 from("jgroups:clusterName?enableViewMessages=true").
   filter(dropNonCoordinatorViews()).
   threads().delay(delayIfContextNotStarted(SECONDS.toMillis(5))). // run in separated and delayed thread. Delay only if the context hasn't been started already. 
-  to("controlbus:route?routeId=masterRoute&action=start&async=true");
+  to("controlbus:route?routeId=masterRoute&action=start&async=true");
 
-from("timer://master?repeatCount=1").routeId("masterRoute").autoStartup(false).to(masterMockUri); 
+from("timer://master?repeatCount=1").routeId("masterRoute").autoStartup(false).to(masterMockUri); 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 == Examples
@@ -266,7 +266,7 @@ mockEndpoint.assertIsSatisfied();
 === Receive cluster view change notifications
 
 The snippet below demonstrates how to create the consumer endpoint
-listening to the notifications regarding cluster membership changes. By
+listening to the notifications regarding cluster membership changes. By
 default only regular messages are consumed by the endpoint.
 
 [source,java]
@@ -295,5 +295,5 @@ service.setId("uniqueNodeId");
 ...
 context.addService(service);
 
-from("master:mycluster:jetty:http://localhost:8080/orders").to("jms:orders"); 
+from("master:mycluster:jetty:http://localhost:8080/orders").to("jms:orders"); 
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc
index dbd8f37..a69dc5d 100644
--- a/components/camel-jira/src/main/docs/jira-component.adoc
+++ b/components/camel-jira/src/main/docs/jira-component.adoc
@@ -3,10 +3,10 @@
 
 *Available as of Camel version 3.0*
 
-The JIRA component interacts with the JIRA API by encapsulating
-Atlassian's https://bitbucket.org/atlassian/jira-rest-java-client/src/master/[REST
+The JIRA component interacts with the JIRA API by encapsulating
+Atlassian's https://bitbucket.org/atlassian/jira-rest-java-client/src/master/[REST
 Java Client for JIRA]. It currently provides polling for new issues and
-new comments.  It is also able to create new issues, add comments, change issues, add/remove watchers, add attachment
+new comments.  It is also able to create new issues, add comments, change issues, add/remove watchers, add attachment
 and transition the state of an issue.
 
 Rather than webhooks, this endpoint relies on simple polling. Reasons
@@ -16,7 +16,7 @@ include:
 * The types of payloads we're polling aren't typically large (plus, paging is available in the API)
 * The need to support apps running somewhere not publicly accessible where a webhook would fail
 
-Note that the JIRA API is fairly expansive.  Therefore, this component could be easily expanded to provide additional
+Note that the JIRA API is fairly expansive.  Therefore, this component could be easily expanded to provide additional
 interactions.
 
 Maven users will need to add the following dependency to their pom.xml
@@ -182,9 +182,9 @@ to generate the client private key, consumer key, verification code and access t
 
 == JQL:
 
-The JQL URI option is used by both consumer endpoints.  Theoretically,
+The JQL URI option is used by both consumer endpoints.  Theoretically,
 items like "project key", etc. could be URI options themselves.
- However, by requiring the use of JQL, the consumers become much more
+ However, by requiring the use of JQL, the consumers become much more
 flexible and powerful.
 
 At the bare minimum, the consumers will require the following:
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 4a9a7b6..7be325d 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -46,7 +46,7 @@ number of options to configure for performance, and clustered
 environments.
 ====
 
-This component allows messages to be sent to (or consumed from) a
+This component allows messages to be sent to (or consumed from) a
 http://java.sun.com/products/jms/[JMS] Queue or Topic. It uses Spring's
 JMS support for declarative transactions, including Spring's
 `JmsTemplate` for sending and a `MessageListenerContainer` for
@@ -757,24 +757,24 @@ following JMS message types:
 [width="100%",cols="10%,10%,80%",options="header",]
 |=======================================================================
 |Body Type |JMS Message |Comment
-|`String` |`javax.jms.TextMessage` | 
+|`String` |`javax.jms.TextMessage` | 
 
 |`org.w3c.dom.Node` |`javax.jms.TextMessage` |The DOM will be converted
 to `String`.
 
-|`Map` |`javax.jms.MapMessage` | 
+|`Map` |`javax.jms.MapMessage` | 
 
-|`java.io.Serializable` |`javax.jms.ObjectMessage` | 
+|`java.io.Serializable` |`javax.jms.ObjectMessage` | 
 
-|`byte[]` |`javax.jms.BytesMessage` | 
+|`byte[]` |`javax.jms.BytesMessage` | 
 
-|`java.io.File` |`javax.jms.BytesMessage` | 
+|`java.io.File` |`javax.jms.BytesMessage` | 
 
-|`java.io.Reader` |`javax.jms.BytesMessage` | 
+|`java.io.Reader` |`javax.jms.BytesMessage` | 
 
-|`java.io.InputStream` |`javax.jms.BytesMessage` | 
+|`java.io.InputStream` |`javax.jms.BytesMessage` | 
 
-|`java.nio.ByteBuffer` |`javax.jms.BytesMessage` | 
+|`java.nio.ByteBuffer` |`javax.jms.BytesMessage` | 
 |=======================================================================
 
 When receiving a JMS message, Camel converts the JMS message to the
@@ -1048,7 +1048,7 @@ If both the `CamelJmsDestination` and the `CamelJmsDestinationName`
 headers are set, `CamelJmsDestination` takes priority. Keep in mind that
 the JMS producer removes both `CamelJmsDestination` and
 `CamelJmsDestinationName` headers from the exchange and do not propagate
-them to the created JMS message in order to avoid the accidental loops
+them to the created JMS message in order to avoid the accidental loops
 in the routes (in scenarios when the message will be forwarded to the
 another JMS endpoint).
 
diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc
index 52fabfd..bd08eea 100644
--- a/components/camel-jolt/src/main/docs/jolt-component.adoc
+++ b/components/camel-jolt/src/main/docs/jolt-component.adoc
@@ -3,12 +3,12 @@
 
 *Available as of Camel version 2.16*
 
-The Jolt component allows you to process a JSON messages using an
+The Jolt component allows you to process a JSON messages using an
 https://github.com/bazaarvoice/jolt[JOLT] specification. This can be
 ideal when doing JSON to JSON transformation.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -20,7 +20,7 @@ their `pom.xml` for this component:
 </dependency>
 ------------------------------------------------------------
 
- 
+ 
 
 == URI format
 
@@ -29,12 +29,12 @@ their `pom.xml` for this component:
 jolt:specName[?options]
 -----------------------
 
-Where *specName* is the classpath-local URI of the specification to
+Where *specName* is the classpath-local URI of the specification to
 invoke; or the complete URL of the remote specification
-(eg: \file://folder/myfile.vm).
+(eg: \file://folder/myfile.vm).
 
 You can append query options to the URI in the following
-format, `?option=value&option=value&...`
+format, `?option=value&option=value&...`
 
 == Options
 
@@ -156,7 +156,7 @@ from("direct:in").
   to("jolt:dummy");
 ---------------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 09ac587..8346852 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -269,8 +269,8 @@ log a WARN.
 The `JpaComponent` looks up automatically the
 `TransactionManager` from the Registry. If Camel
 won't find any `TransactionManager` instance registered, it will also
-look up for the `TransactionTemplate` and try to
-extract `TransactionManager` from it.
+look up for the `TransactionTemplate` and try to
+extract `TransactionManager` from it.
 
 If none `TransactionTemplate` is available in the registry,
 `JpaEndpoint` will auto create their own instance of
diff --git a/components/camel-jsch/src/main/docs/scp-component.adoc b/components/camel-jsch/src/main/docs/scp-component.adoc
index 29ffcc1..c637eb2 100644
--- a/components/camel-jsch/src/main/docs/scp-component.adoc
+++ b/components/camel-jsch/src/main/docs/scp-component.adoc
@@ -154,7 +154,7 @@ The component supports 4 options, which are listed below.
 
 Currently camel-jsch only supports a
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Producer.html[Producer]
-(i.e. copy files to another host). 
+(i.e. copy files to another host). 
 
 == See Also
 
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index 824b58f..4595fee 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -206,7 +206,7 @@ And in XML DSL:
 </route>
 ----
 
-This option is also available on the `@JsonPath` annotation.
+This option is also available on the `@JsonPath` annotation.
 
 == Inline Simple exceptions
 
@@ -285,11 +285,11 @@ public class Foo {
 == Encoding Detection
 
 The encoding of the JSON document is
-detected automatically, if the document is encoded in unicode  (UTF-8,
-UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE ) as specified in  RFC-4627. If
+detected automatically, if the document is encoded in unicode  (UTF-8,
+UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE ) as specified in  RFC-4627. If
 the encoding is a non-unicode encoding, you can either make sure that
 you enter the document in String format to the JSONPath component or you
-can specify the encoding in the header "*CamelJsonPathJsonEncoding*"
+can specify the encoding in the header "*CamelJsonPathJsonEncoding*"
 (JsonpathConstants.HEADER_JSON_ENCODING).
 
 == Split JSon data into sub rows as JSon
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index a9da0d3..d070dcb 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.13*
 
 The Kafka component is used for communicating with
-http://kafka.apache.org/[Apache Kafka] message broker.
+http://kafka.apache.org/[Apache Kafka] message broker.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component.
@@ -405,7 +405,7 @@ camelContext.addRoutes(new RouteBuilder() {
     }
 });
 ----
- 
+ 
 
 === Producing messages to Kafka
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index 47e3171..536aceb 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes ConfigMap component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes ConfigMap component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes ConfigMap operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
index c783095..bc7f2b5 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.20*
 
-The Kubernetes Deployments component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Deployments component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes secret operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
index d43783a..7ad8fcb 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.23*
 
-The Kubernetes HPA component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes HPA component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes hpa operations and a consumer to consume kubernetes
 hpa events.
  
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
index b52d563..a2c0e2a 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.23*
 
-The Kubernetes Job component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Job component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes job operations.
  
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
index 57efcb8..35d59af 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Namespaces component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Namespaces component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes namespace operations and a consumer to consume
 kubernetes namespace events.
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
index 4820f8b..5c76e9d 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Nodes component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Nodes component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes node operations and a consumer to consume kubernetes
 node events.
  
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
index a3803b9..f9e364c 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Persistent Volume Claim component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Persistent Volume Claim component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes persistent volume claim operations.
  
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
index f7e99fd..b5bf15d 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Persistent Volume component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Persistent Volume component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes persistent volume operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
index 9008ef5..7bd9e00 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Pods component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Pods component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes pod operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
index aa49de6..c5bafe9 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Replication Controller component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Replication Controller component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes replication controller operations and a consumer to
 consume kubernetes replication controller events.
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
index 9bdcf75..c9323d9 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Resources Quota component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Resources Quota component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes resource quota operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
index 3edb86d..74c6458 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Secrets component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Secrets component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes secret operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
index 509db5a..cd3351a 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Service Account component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Service Account component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes Service Account operations.
 
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
index 7f943bb..aea2bb6 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Services component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Services component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes service operations and a consumer to consume kubernetes
 service events.
 
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes.adoc b/components/camel-kubernetes/src/main/docs/kubernetes.adoc
index 633e249..1cf4e35 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes.adoc
@@ -2,7 +2,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes components integrate your application with Kubernetes standalone or on top of Openshift. 
+The Kubernetes components integrate your application with Kubernetes standalone or on top of Openshift. 
 
 The camel-kubernetes consists of 13 components:
 
@@ -26,7 +26,7 @@ In OpenShift, also:
 
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 [source,xml]
 ------------------------------------------------------------
 <dependency>
diff --git a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
index 6ee13c9..475e2ef 100644
--- a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The OpenShift Build Config component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The OpenShift Build Config component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes build config operations. 
 
 
diff --git a/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
index 0921ba5..3b819a7 100644
--- a/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/openshift-builds-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.17*
 
-The Kubernetes Builds component is one of xref:kubernetes.adoc[Kubernetes Components] which
+The Kubernetes Builds component is one of xref:kubernetes.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes build operations.
 
 
diff --git a/components/camel-kura/src/main/docs/kura.adoc b/components/camel-kura/src/main/docs/kura.adoc
index b41186f..056eaf1 100644
--- a/components/camel-kura/src/main/docs/kura.adoc
+++ b/components/camel-kura/src/main/docs/kura.adoc
@@ -7,7 +7,7 @@ This documentation page covers the integration options of Camel with the
 https://eclipse.org/kura/[Eclipse Kura] M2M gateway. The common reason
 to deploy Camel routes into the Eclipse Kura is to provide enterprise
 integration patterns and Camel components to the messaging M2M gateway.
-For example you might want to install Kura on Raspberry PI, then read
+For example you might want to install Kura on Raspberry PI, then read
 temperature from the sensor attached to that Raspberry PI using Kura
 services and finally forward the current temperature value to your data
 center service using Camel EIP and components.
@@ -15,7 +15,7 @@ center service using Camel EIP and components.
 [[Kura-KuraRouteractivator]]
 == KuraRouter activator
 
-Bundles deployed to the Eclipse Kura are usually
+Bundles deployed to the Eclipse Kura are usually
 http://eclipse.github.io/kura/doc/hello-example.html#create-java-class[developed
 as bundle activators]. So the easiest way to deploy Apache Camel routes
 into the Kura is to create an OSGi bundle containing the class extending
@@ -35,9 +35,9 @@ public class MyKuraRouter extends KuraRouter {
 -------------------------------------------------------
 
 Keep in mind that `KuraRouter` implements
-the `org.osgi.framework.BundleActivator` interface, so you need to
-register its `start` and `stop` lifecycle methods
-while http://eclipse.github.io/kura/doc/hello-example.html#create-component-class[creating
+the `org.osgi.framework.BundleActivator` interface, so you need to
+register its `start` and `stop` lifecycle methods
+while http://eclipse.github.io/kura/doc/hello-example.html#create-component-class[creating
 Kura bundle component class].
 
 Kura router starts its own OSGi-aware `CamelContext`. It means that for
@@ -94,9 +94,9 @@ start <your-bundle-id>
 ----------------------------------------------------------------------------------
 
 [[Kura-KuraRouterutilities]]
-=== KuraRouter utilities 
+=== KuraRouter utilities 
 
- Kura router base class provides many useful utilities. This section
+ Kura router base class provides many useful utilities. This section
 explores each of them.
 
 [[Kura-SLF4Jlogger]]
@@ -160,7 +160,7 @@ public class MyKuraRouter extends KuraRouter {
 [[Kura-ProducerTemplate]]
 ==== ProducerTemplate
 
-Protected member `producerTemplate` is the `ProducerTemplate` instance
+Protected member `producerTemplate` is the `ProducerTemplate` instance
 associated with the given Camel context.
 
 [source,java]
@@ -179,7 +179,7 @@ public class MyKuraRouter extends KuraRouter {
 [[Kura-ConsumerTemplate]]
 ==== ConsumerTemplate
 
-Protected member `consumerTemplate` is the `ConsumerTemplate` instance
+Protected member `consumerTemplate` is the `ConsumerTemplate` instance
 associated with the given Camel context.
 
 [source,java]
@@ -216,7 +216,7 @@ public class MyKuraRouter extends KuraRouter {
 
 If service is not found, a `null` value is returned. If you want your
 application to fail if the service is not available, use
-`requiredService(Class)` method instead. The `requiredService` throws
+`requiredService(Class)` method instead. The `requiredService` throws
 `IllegalStateException` if a service cannot be found.
 
 [source,java]
@@ -244,7 +244,7 @@ class:
 [source,java]
 --------------------------------------------------------------------------
 public class MyKuraRouter extends KuraRouter {
- 
+ 
   ...
 
   protected void beforeStart(CamelContext camelContext) {
@@ -267,7 +267,7 @@ PID using the OSGi ConfigurationAdmin. This approach allows you to
 define Camel XML routes file per deployed `KuraRouter`. In order to
 update a route, just edit an appropriate configuration property and
 restart a bundle associated with it. The content of
-the `kura.camel.BUNDLE-SYMBOLIC-NAME.route` property is expected to be
+the `kura.camel.BUNDLE-SYMBOLIC-NAME.route` property is expected to be
 Camel XML route file, for example:
 
 [source,java]
@@ -280,7 +280,7 @@ Camel XML route file, for example:
 </routes>
 ------------------------------------------------------
 
- 
+ 
 
 [[Kura-DeployingKurarouterasadeclarativeOSGiservice]]
 === Deploying Kura router as a declarative OSGi service
diff --git a/components/camel-ldap/src/main/docs/ldap-component.adoc b/components/camel-ldap/src/main/docs/ldap-component.adoc
index fdf5fc3..f6ca606 100644
--- a/components/camel-ldap/src/main/docs/ldap-component.adoc
+++ b/components/camel-ldap/src/main/docs/ldap-component.adoc
@@ -378,7 +378,7 @@ public class CustomSocketFactory extends SSLSocketFactory {
 }
 -----------------------------------------------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
index f57b365..e309d60 100644
--- a/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
+++ b/components/camel-linkedin/camel-linkedin-component/src/main/docs/linkedin-component.adoc
@@ -5,7 +5,7 @@
 
 The LinkedIn component provides access to all of LinkedIn REST APIs
 documented
-at https://developer.linkedin.com/rest[https://developer.linkedin.com/rest]. 
+at https://developer.linkedin.com/rest[https://developer.linkedin.com/rest]. 
 
 LinkedIn uses OAuth2.0 for all client application authentication. In
 order to use camel-linkedin with your account, you'll need to create a
@@ -15,8 +15,8 @@ The LinkedIn application's client id and secret will allow access to
 LinkedIn REST APIs which require a current user. A user access token is
 generated and managed by component for an end user. Alternatively the
 Camel application can register an implementation
-of org.apache.camel.component.linkedin.api.OAuthSecureStorage to provide
-an org.apache.camel.component.linkedin.apiOAuthToken OAuth token.
+of org.apache.camel.component.linkedin.api.OAuthSecureStorage to provide
+an org.apache.camel.component.linkedin.apiOAuthToken OAuth token.
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -167,22 +167,22 @@ some endpoints. The endpoint URI MUST contain a prefix.
 Endpoint options that are not mandatory are denoted by []. When there
 are no mandatory options for an endpoint, one of the set of [] options
 MUST be provided. Producer endpoints can also use a special
-option *inBody* that in turn should contain the name of the endpoint
+option *inBody* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *CamelLinkedIn.<option>*. Note that the *inBody* option
-overrides message header, i.e. the endpoint option *inBody=option* would
-override a *CamelLinkedIn.option* header.
+the format *CamelLinkedIn.<option>*. Note that the *inBody* option
+overrides message header, i.e. the endpoint option *inBody=option* would
+override a *CamelLinkedIn.option* header.
 
 For more information on the endpoints and options see LinkedIn REST API
 documentation
-at https://developer.linkedin.com/rest[https://developer.linkedin.com/rest]. 
+at https://developer.linkedin.com/rest[https://developer.linkedin.com/rest]. 
 
-=== Endpoint prefix _comments_
+=== Endpoint prefix _comments_
 
-The following endpoints can be invoked with the prefix *comments* as
+The following endpoints can be invoked with the prefix *comments* as
 follows:
 
 [source,java]
@@ -200,7 +200,7 @@ follows:
 |=======================================================================
 
 [[LinkedIn-URIOptionsforcomments]]
-URI Options for _comments_
+URI Options for _comments_
 
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
@@ -211,9 +211,9 @@ URI Options for _comments_
 |fields |String
 |=======================================================================
 
-=== Endpoint prefix _companies_
+=== Endpoint prefix _companies_
 
-The following endpoints can be invoked with the prefix *companies* as
+The following endpoints can be invoked with the prefix *companies* as
 follows:
 
 [source,java]
@@ -259,14 +259,14 @@ follows:
 |=======================================================================
 
 [[LinkedIn-URIOptionsforcompanies]]
-URI Options for _companies_
+URI Options for _companies_
 
 If a value is not provided for one of the option(s) *[companySizes,
 count, email_domain, end_timestamp, event_type, geos, industries,
 is_company_admin, jobFunc, secure_urls, seniorities, start,
 start_timestamp, time_granularity]* either in the endpoint URI or in a
-message header, it will be assumed to be *null*. Note that
-the *null* value(s) will only be used if other options do not satisfy
+message header, it will be assumed to be *null*. Note that
+the *null* value(s) will only be used if other options do not satisfy
 matching endpoints.
 
 [width="100%",cols="50%,50%",options="header",]
@@ -316,9 +316,9 @@ matching endpoints.
 |updatecomment |org.apache.camel.component.linkedin.api.model.UpdateComment
 |=======================================================================
 
-=== Endpoint prefix _groups_
+=== Endpoint prefix _groups_
 
-The following endpoints can be invoked with the prefix *groups* as
+The following endpoints can be invoked with the prefix *groups* as
 follows:
 
 [source,java]
@@ -336,7 +336,7 @@ follows:
 |=======================================================================
 
 [[LinkedIn-URIOptionsforgroups]]
-URI Options for _groups_
+URI Options for _groups_
 
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
@@ -347,9 +347,9 @@ URI Options for _groups_
 |post |org.apache.camel.component.linkedin.api.model.Post
 |=======================================================================
 
-=== Endpoint prefix _jobs_
+=== Endpoint prefix _jobs_
 
-The following endpoints can be invoked with the prefix *jobs* as
+The following endpoints can be invoked with the prefix *jobs* as
 follows:
 
 [source,java]
@@ -371,7 +371,7 @@ follows:
 |=======================================================================
 
 [[LinkedIn-URIOptionsforjobs]]
-URI Options for _jobs_
+URI Options for _jobs_
 
 [width="100%",cols="50%,50%",options="header",]
 |=======================================================================
@@ -386,9 +386,9 @@ URI Options for _jobs_
 |partner_job_id |Long
 |=======================================================================
 
-=== Endpoint prefix _people_
+=== Endpoint prefix _people_
 
-The following endpoints can be invoked with the prefix *people* as
+The following endpoints can be invoked with the prefix *people* as
 follows:
 
 [source,java]
@@ -470,13 +470,13 @@ show_hidden_members, start, type |org.apache.camel.component.linkedin.api.model.
 |=======================================================================
 
 [[LinkedIn-URIOptionsforpeople]]
-URI Options for _people_
+URI Options for _people_
 
 If a value is not provided for one of the option(s) *[after, before,
 category, count, membership_state, modified_since, order,
 public_profile_url, role, scope, secure_urls, show_hidden_members,
 start, type]* either in the endpoint URI or in a message header, it will
-be assumed to be *null*. Note that the *null* value(s) will only be used
+be assumed to be *null*. Note that the *null* value(s) will only be used
 if other options do not satisfy matching endpoints.
 
 [width="100%",cols="50%,50%",options="header",]
@@ -540,9 +540,9 @@ if other options do not satisfy matching endpoints.
 |updatecomment |org.apache.camel.component.linkedin.api.model.UpdateComment
 |=======================================================================
 
-=== Endpoint prefix _posts_
+=== Endpoint prefix _posts_
 
-The following endpoints can be invoked with the prefix *posts* as
+The following endpoints can be invoked with the prefix *posts* as
 follows:
 
 [source,java]
@@ -568,13 +568,13 @@ follows:
 
 |removePost |post |post_id |
 |=======================================================================
- 
+ 
 [[LinkedIn-URIOptionsforposts]]
-URI Options for _posts_
+URI Options for _posts_
 
 If a value is not provided for one of the option(s) *[count, start]*
 either in the endpoint URI or in a message header, it will be assumed to
-be *null*. Note that the *null* value(s) will only be used if other
+be *null*. Note that the *null* value(s) will only be used if other
 options do not satisfy matching endpoints.
 
 [width="100%",cols="50%,50%",options="header",]
@@ -598,9 +598,9 @@ options do not satisfy matching endpoints.
 |start |Long
 |=======================================================================
 
-=== Endpoint prefix _search_
+=== Endpoint prefix _search_
 
-The following endpoints can be invoked with the prefix *search* as
+The following endpoints can be invoked with the prefix *search* as
 follows:
 
 [source,java]
@@ -623,14 +623,14 @@ last_name, postal_code, school_name, sort, start, title |org.apache.camel.compon
 |=======================================================================
 
 [[LinkedIn-URIOptionsforsearch]]
-URI Options for _search_
+URI Options for _search_
 
 If a value is not provided for one of the option(s) *[company_name,
 count, country_code, current_company, current_school, current_title,
 distance, facet, facets, first_name, hq_only, job_title, keywords,
 last_name, postal_code, school_name, sort, start, title]* either in the
-endpoint URI or in a message header, it will be assumed to be *null*.
-Note that the *null* value(s) will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be *null*.
+Note that the *null* value(s) will only be used if other options do not
 satisfy matching endpoints.
 
 [width="100%",cols="50%,50%",options="header",]
@@ -682,18 +682,18 @@ satisfy matching endpoints.
 
 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
+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
 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
-the entire list or array. 
+the entire list or array. 
 
 == Message Headers
 
 Any URI option can be provided in a message header for producer
-endpoints with a *CamelLinkedIn.* prefix.
+endpoints with a *CamelLinkedIn.* prefix.
 
 == Message body
 
@@ -720,7 +720,7 @@ The following route polls user's connections every 30 seconds:
         .to("bean:foo");
 -------------------------------------------------------------------------------------
 
-The following route uses a producer with dynamic header options. The
+The following route uses a producer with dynamic header options. The
 *personId* header has the LinkedIn person ID, so its assigned to the
 *CamelLinkedIn.person_id* header as follows:
 
diff --git a/components/camel-log/src/main/docs/log-component.adoc b/components/camel-log/src/main/docs/log-component.adoc
index 972093f..d1b9396 100644
--- a/components/camel-log/src/main/docs/log-component.adoc
+++ b/components/camel-log/src/main/docs/log-component.adoc
@@ -29,11 +29,11 @@ can append query options to the URI in the following format,
 *Using Logger instance from the Registry*
 
 If there's single instance
-of `org.slf4j.Logger` found in the Registry, the *loggingCategory* is no
+of `org.slf4j.Logger` found in the Registry, the *loggingCategory* is no
 longer used to create logger instance. The registered instance is used
-instead. Also it is possible to reference particular `Logger` instance
-using `?logger=#myLogger` URI parameter. Eventually, if there's no
-registered and URI `logger` parameter, the logger instance is created
+instead. Also it is possible to reference particular `Logger` instance
+using `?logger=#myLogger` URI parameter. Eventually, if there's no
+registered and URI `logger` parameter, the logger instance is created
 using *loggingCategory*.
 ====
 
@@ -347,17 +347,17 @@ options:
 
 *Improvement as of Camel 2.12.4/2.13.1*
 
-When using Log component inside OSGi (e.g., in Karaf), the underlying
+When using Log component inside OSGi (e.g., in Karaf), the underlying
 logging mechanisms are provided by PAX logging. It searches for a bundle
-which invokes `org.slf4j.LoggerFactory.getLogger()` method and
+which invokes `org.slf4j.LoggerFactory.getLogger()` method and
 associates the bundle with the logger instance. Without specifying
-custom `org.sfl4j.Logger` instance, the logger created by Log component
+custom `org.sfl4j.Logger` instance, the logger created by Log component
 is associated with `camel-core` bundle.
 
 In some scenarios it is required that the bundle associated with logger
 should be the bundle which contains route definition. To do this, either
-register single instance of `org.slf4j.Logger` in the Registry or
-reference it using `logger` URI parameter.
+register single instance of `org.slf4j.Logger` in the Registry or
+reference it using `logger` URI parameter.
 
 == See Also
 
diff --git a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
index 2811654..936b57c 100644
--- a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
+++ b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
@@ -4,9 +4,9 @@
 *Available as of Camel version 2.17*
 
 The
-LZF xref:manual::data-format.adoc[Data Format] is a message compression
+LZF xref:manual::data-format.adoc[Data Format] is a message compression
 and de-compression format. It uses the
-LZF deflate algorithm. Messages marshalled using LZF compression can be
+LZF deflate algorithm. Messages marshalled using LZF compression can be
 unmarshalled using LZF decompression just prior to being consumed at the
 endpoint. The compression capability is quite useful when you deal with
 large XML and Text based payloads or when you read messages previously
@@ -69,9 +69,9 @@ from("direct:start").marshal().lzf().to("activemq:queue:MY_QUEUE");
 
 == Unmarshal
 
-In this example we unmarshal a LZF payload from an ActiveMQ queue called
-MY_QUEUE to its original format, and forward it for processing to
-the `UnGZippedMessageProcessor`.
+In this example we unmarshal a LZF payload from an ActiveMQ queue called
+MY_QUEUE to its original format, and forward it for processing to
+the `UnGZippedMessageProcessor`.
 
 [source,java]
 ----------------------------------------------------------------------------------------------
@@ -81,9 +81,9 @@ from("activemq:queue:MY_QUEUE").unmarshal().lzf().process(new UnCompressedMessag
 == Dependencies
 
 To useLZF compression in your camel routes you need to add a dependency
-on *camel-lzf* which implements this data format.
+on *camel-lzf* which implements this data format.
 
-If you use Maven you can just add the following to your `pom.xml`,
+If you use Maven you can just add the following to your `pom.xml`,
 substituting the version number for the latest & greatest release.
 
 [source,xml]
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 9bbeac0..c664ff5 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -333,7 +333,7 @@ determines the port number to use based on the protocol.
 == SSL support
 
 The underlying mail framework is responsible for providing SSL support.
- You may either configure SSL/TLS support by completely specifying the
+ You may either configure SSL/TLS support by completely specifying the
 necessary Java Mail API configuration options, or you may provide a
 configured SSLContextParameters through the component or endpoint
 configuration.
@@ -342,9 +342,9 @@ configuration.
 
 The mail component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the mail component.
 
 [[Mail-Programmaticconfigurationoftheendpoint]]
@@ -634,7 +634,7 @@ the Splitter as shown below
 </split>
 ---------------------------------------------------------------------------------
 
- 
+ 
 
 From Camel 2.16 onwards you can also split the attachments as byte[] to
 be stored as the message body. This is done by creating the expression
diff --git a/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc b/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
index 81964f2..524f428 100644
--- a/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
+++ b/components/camel-mail/src/main/docs/mime-multipart-dataformat.adoc
@@ -164,7 +164,7 @@ Content-Type: multipart/related;
 x-bar: also there
 included: must be included
 x-foo: any value
- 
+ 
 ------=_Part_0_1134128170.1447659361365
 Content-Type: text/plain
 Content-Transfer-Encoding: 8bit
diff --git a/components/camel-metrics/src/main/docs/metrics-component.adoc b/components/camel-metrics/src/main/docs/metrics-component.adoc
index 7581ef9..6f65b67 100644
--- a/components/camel-metrics/src/main/docs/metrics-component.adoc
+++ b/components/camel-metrics/src/main/docs/metrics-component.adoc
@@ -12,14 +12,14 @@ endif::[]
 
 == Metrics Component
 
-The Metrics component allows to collect various metrics directly
+The Metrics component allows to collect various metrics directly
 from Camel routes. Supported metric types
-are xref:#MetricsComponent-counter[counter], xref:#MetricsComponent-histogram[histogram],
-xref:#MetricsComponent-meter[meter], xref:#MetricsComponent-timer[timer] and xref:#MetricsComponent-gauge[gauge]. http://metrics.dropwizard.io[Metrics] provides
+are xref:#MetricsComponent-counter[counter], xref:#MetricsComponent-histogram[histogram],
+xref:#MetricsComponent-meter[meter], xref:#MetricsComponent-timer[timer] and xref:#MetricsComponent-gauge[gauge]. http://metrics.dropwizard.io[Metrics] provides
 simple way to measure behaviour of application. Configurable
-reporting backend is enabling different integration options for
+reporting backend is enabling different integration options for
 collecting and visualizing statistics. The component also provides
-a `MetricsRoutePolicyFactory` which allows to expose route statistics
+a `MetricsRoutePolicyFactory` which allows to expose route statistics
 using Dropwizard Metrics, see bottom of page for details.
 
 Maven users will need to add the following dependency to their `pom.xml`
@@ -190,7 +190,7 @@ class MyBean extends RouteBuilder {
 
 Each metric has type and name. Supported types are
 xref:#MetricsComponent-counter[counter],
-xref:#MetricsComponent-histogram[histogram], xref:#MetricsComponent-meter[meter],
+xref:#MetricsComponent-histogram[histogram], xref:#MetricsComponent-meter[meter],
 xref:#MetricsComponent-timer[timer] and xref:#MetricsComponent-gauge[gauge].
 Metric name is simple string. If metric type is not provided then type meter is used by default.
 
@@ -228,13 +228,13 @@ metrics:counter:metricname[?options]
 [width="100%",options="header"]
 |=====================================================
 |Name |Default |Description
-|increment  |- |Long value to add to the counter
+|increment  |- |Long value to add to the counter
 |decrement |- |Long value to subtract from the counter
 |=====================================================
 
 If neither `increment` or `decrement` is defined then counter value will
 be incremented by one. If `increment` and `decrement` are both defined
-only increment operation is called. 
+only increment operation is called. 
 
 [source,java]
 ----
@@ -268,8 +268,8 @@ values specified in Metrics component URI.
 [width="100%",cols="10%,80%,10%",options="header",]
 |====================================================================
 |Name |Description |Expected type
-|CamelMetricsCounterIncrement  |Override increment value in URI |Long
-|CamelMetricsCounterDecrement  |Override decrement value in URI |Long
+|CamelMetricsCounterIncrement  |Override increment value in URI |Long
+|CamelMetricsCounterDecrement  |Override decrement value in URI |Long
 |====================================================================
 
 [source,java]
@@ -359,10 +359,10 @@ metrics:meter:metricname[?options]
 [width="100%",options="header"]
 |===================================
 |Name |Default |Description
-|mark  |- |Long value to use as mark
+|mark  |- |Long value to use as mark
 |===================================
 
-If `mark` is not set then `meter.mark()` is called without argument.
+If `mark` is not set then `meter.mark()` is called without argument.
 
 [source,java]
 ----
@@ -465,7 +465,7 @@ metrics:gauge:metricname[?options]
 [width="100%",options="header"]
 |=====================================================
 |Name |Default |Description
-|subject  |- |Any object to be observed by the gauge
+|subject  |- |Any object to be observed by the gauge
 |=====================================================
 
 If `subject` is not defined it's simply ignored, i.e. the gauge is not registered.
@@ -487,7 +487,7 @@ default one specified in a URI.
 [width="100%",cols="10%,80%,10%",options="header",]
 |====================================================================
 |Name |Description |Expected type
-|CamelMetricsGaugeSubject  |Override subject value in URI |Object
+|CamelMetricsGaugeSubject  |Override subject value in URI |Object
 |====================================================================
 
 [source,java]
@@ -501,16 +501,16 @@ from("direct:in")
 
 == MetricsRoutePolicyFactory
 
-This factory allows to add a RoutePolicy for each
+This factory allows to add a RoutePolicy for each
 route which exposes route utilization statistics using Dropwizard metrics.
 This factory can be used in Java and XML as the examples below
-demonstrates. 
+demonstrates. 
 
 NOTE: Instead of using the MetricsRoutePolicyFactory you can define a
 MetricsRoutePolicy per route you want to instrument, in case you only
 want to instrument a few selected routes.
 
-From Java you just add the factory to the `CamelContext` as shown below:
+From Java you just add the factory to the `CamelContext` as shown below:
 
 [source,java]
 ----
@@ -525,7 +525,7 @@ And from XML DSL you define a <bean> as follows:
   <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory"/>
 ----
 
-The `MetricsRoutePolicyFactory` and `MetricsRoutePolicy` supports the
+The `MetricsRoutePolicyFactory` and `MetricsRoutePolicy` supports the
 following options:
 
 [width="100%",options="header"]
@@ -544,7 +544,7 @@ want fine grained mbeans per statistics type.
 |prettyPrint |false |Whether to use pretty print when outputting
 statistics in json format
 
-|metricsRegistry |  |Allow to use a shared
+|metricsRegistry |  |Allow to use a shared
 `com.codahale.metrics.MetricRegistry`. If none is provided then Camel
 will create a shared instance used by the this CamelContext.
 
@@ -561,10 +561,10 @@ value. Where `###name###` is the name of the CamelContext. `###routeId###`
 is the name of the route. And `###type###` is the value of responses.
 |=======================================================================
 
- 
+ 
 
 From Java code you can get hold of
-the `com.codahale.metrics.MetricRegistry` from the
+the `com.codahale.metrics.MetricRegistry` from the
 `org.apache.camel.component.metrics.routepolicy.MetricsRegistryService`
 as shown below:
 
@@ -582,12 +582,12 @@ if (registryService != null) {
 *Available as of Camel 2.17*
 
 This factory allows to use metrics to
-capture Message History performance
+capture Message History performance
 statistics while routing messages. It works by using a metrics Timer for
-each node in all the routes. This factory can be used in Java and XML as
-the examples below demonstrates. 
+each node in all the routes. This factory can be used in Java and XML as
+the examples below demonstrates. 
 
-From Java you just set the factory to the `CamelContext` as shown below:
+From Java you just set the factory to the `CamelContext` as shown below:
 
 [source,java]
 ----
@@ -620,7 +620,7 @@ want fine grained mbeans per statistics type.
 |prettyPrint |false |Whether to use pretty print when outputting
 statistics in json format
 
-|metricsRegistry |  |Allow to use a shared
+|metricsRegistry |  |Allow to use a shared
 `com.codahale.metrics.MetricRegistry`. If none is provided then Camel
 will create a shared instance used by the this CamelContext.
 
@@ -650,8 +650,8 @@ MetricsMessageHistoryService service = context.hasService(MetricsMessageHistoryS
 String json = service.dumpStatisticsAsJson();
 ----
 
-And the JMX API the MBean is registered in the `type=services` tree
-with `name=MetricsMessageHistoryService`.
+And the JMX API the MBean is registered in the `type=services` tree
+with `name=MetricsMessageHistoryService`.
 
 == InstrumentedThreadPoolFactory
 
diff --git a/components/camel-micrometer/src/main/docs/micrometer-component.adoc b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index 13874d5..fa86a27 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -12,16 +12,16 @@ endif::[]
 
 == Micrometer Component
 
-The Micrometer component allows to collect various metrics directly
+The Micrometer component allows to collect various metrics directly
 from Camel routes. Supported metric types
-are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-summary[summary],
-and xref:#MicrometerComponent-timer[timer]. http://micrometer.io/[Micrometer] provides
+are xref:#MicrometerComponent-counter[counter], xref:#MicrometerComponent-summary[summary],
+and xref:#MicrometerComponent-timer[timer]. http://micrometer.io/[Micrometer] provides
 simple way to measure the behaviour of an application. Configurable
-reporting backends (via Micrometer registries) enable different integration options for
+reporting backends (via Micrometer registries) enable different integration options for
 collecting and visualizing statistics.
 
 The component also provides
-a `MicrometerRoutePolicyFactory` which allows to expose route statistics
+a `MicrometerRoutePolicyFactory` which allows to expose route statistics
 using Micrometer as well as `EventNotifier` implementations for counting
 routes and timing exchanges from their creation to their completion.
 
@@ -241,7 +241,7 @@ micrometer:counter:name[?options]
 [width="100%",options="header"]
 |=====================================================
 |Name |Default |Description
-|increment  |- |Double value to add to the counter
+|increment  |- |Double value to add to the counter
 |decrement |- |Double value to subtract from the counter
 |=====================================================
 
@@ -284,8 +284,8 @@ Like in `camel-metrics`, specific Message headers can be used to override
 [width="100%",cols="10%,80%,10%",options="header",]
 |====================================================================
 |Name |Description |Expected type
-|CamelMetricsCounterIncrement  |Override increment value in URI |Double
-|CamelMetricsCounterDecrement  |Override decrement value in URI |Double
+|CamelMetricsCounterIncrement  |Override increment value in URI |Double
+|CamelMetricsCounterDecrement  |Override decrement value in URI |Double
 |====================================================================
 
 [source,java]
@@ -433,16 +433,16 @@ from("direct:in")
 
 == MicrometerRoutePolicyFactory
 
-This factory allows to add a RoutePolicy for each
+This factory allows to add a RoutePolicy for each
 route in order to exposes route utilization statistics using Micrometer.
 This factory can be used in Java and XML as the examples below
-demonstrates. 
+demonstrates. 
 
 NOTE: Instead of using the `MicrometerRoutePolicyFactory` you can define a
 dedicated `MicrometerRoutePolicy` per route you want to instrument, in case you only
 want to instrument a few selected routes.
 
-From Java you just add the factory to the `CamelContext` as shown below:
+From Java you just add the factory to the `CamelContext` as shown below:
 
 [source,java]
 ----
@@ -457,29 +457,29 @@ And from XML DSL you define a <bean> as follows:
   <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.micrometer.routepolicy.MicrometerRoutePolicyFactory"/>
 ----
 
-The `MicrometerRoutePolicyFactory` and `MicrometerRoutePolicy` supports the
+The `MicrometerRoutePolicyFactory` and `MicrometerRoutePolicy` supports the
 following options:
 
 [width="100%",options="header"]
 |=======================================================================
 |Name |Default |Description
 |prettyPrint |false |Whether to use pretty print when outputting statistics in json format
-|meterRegistry |  |Allow to use a shared `MeterRegistry`. If none is provided then Camel will create a shared instance used by the this CamelContext.
+|meterRegistry |  |Allow to use a shared `MeterRegistry`. If none is provided then Camel will create a shared instance used by the this CamelContext.
 |durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration in when dumping the statistics as json.
 |=======================================================================
 
-If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
-with `name=MicrometerRoutePolicy`.
+If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
+with `name=MicrometerRoutePolicy`.
 
 
 == MicrometerMessageHistoryFactory
 
-This factory allows to use metrics to capture Message History performance
+This factory allows to use metrics to capture Message History performance
 statistics while routing messages. It works by using a Micrometer Timer for
-each node in all the routes. This factory can be used in Java and XML as
-the examples below demonstrates. 
+each node in all the routes. This factory can be used in Java and XML as
+the examples below demonstrates. 
 
-From Java you just set the factory to the `CamelContext` as shown below:
+From Java you just set the factory to the `CamelContext` as shown below:
 
 [source,java]
 ----
@@ -500,7 +500,7 @@ The following options is supported on the factory:
 |=======================================================================
 |Name |Default |Description
 |prettyPrint |false |Whether to use pretty print when outputting statistics in json format
-|meterRegistry |  |Allow to use a shared `MeterRegistry`. If none is provided then Camel will create a shared instance used by the this CamelContext.
+|meterRegistry |  |Allow to use a shared `MeterRegistry`. If none is provided then Camel will create a shared instance used by the this CamelContext.
 |durationUnit |TimeUnit.MILLISECONDS |The unit to use for duration when dumping the statistics as json.
 |=======================================================================
 
@@ -516,8 +516,8 @@ MicrometerMessageHistoryService service = context.hasService(MicrometerMessageHi
 String json = service.dumpStatisticsAsJson();
 ----
 
-If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
-with `name=MicrometerMessageHistory`.
+If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
+with `name=MicrometerMessageHistory`.
 
 
 == MicrometerEventNotifiers
@@ -544,8 +544,8 @@ MicrometerEventNotifierService service = context.hasService(MicrometerEventNotif
 String json = service.dumpStatisticsAsJson();
 ----
 
-If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
-with `name=MicrometerEventNotifier`.
+If JMX is enabled in the CamelContext, the MBean is registered in the `type=services` tree
+with `name=MicrometerEventNotifier`.
 
 
 == InstrumentedThreadPoolFactory
diff --git a/components/camel-mllp/src/main/docs/mllp-component.adoc b/components/camel-mllp/src/main/docs/mllp-component.adoc
index 6d4a88f..84c146b 100644
--- a/components/camel-mllp/src/main/docs/mllp-component.adoc
+++ b/components/camel-mllp/src/main/docs/mllp-component.adoc
@@ -4,16 +4,16 @@
 *Available as of Camel version 2.17*
 
 The MLLP component is specifically designed to handle the nuances of the
-MLLP protocol and provide the functionality required by Healthcare
+MLLP protocol and provide the functionality required by Healthcare
 providers to communicate with other systems using the MLLP protocol.
- The MLLP component  provides a simple configuration URI, automated HL7
+ The MLLP component  provides a simple configuration URI, automated HL7
 acknowledgment generation and automatic acknowledgement interrogation.
 
 The MLLP protocol does not typically use a large number of concurrent
 TCP connections - a single active TCP connection is the normal case.
- Therefore, the MLLP component uses a simple thread-per-connection model
+ Therefore, the MLLP component uses a simple thread-per-connection model
 based an standard Java Sockets. This keeps the implementation simple
-and eliminates the dependencies other than Camel itself.
+and eliminates the dependencies other than Camel itself.
 
 The component supports the following:
 
@@ -21,7 +21,7 @@ The component supports the following:
 * A Camel producer using a TCP Client
 
 The MLLP component uses byte[] payloads, and relies on Camel Type
-Conversion to convert byte[] to other types.  
+Conversion to convert byte[] to other types.  
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -189,10 +189,10 @@ The component supports 32 options, which are listed below.
 == MLLP Consumer
 
 The MLLP Consumer supports receiving MLLP-framed messages and sending
-HL7 Acknowledgements.  The MLLP Consumer can automatically generate the
+HL7 Acknowledgements.  The MLLP Consumer can automatically generate the
 HL7 Acknowledgement (HL7 Application Acknowledgements only - AA, AE and
 AR), or the acknowledgement can be specified using
-the CamelMllpAcknowledgement exchange property.  Additionally, the type
+the CamelMllpAcknowledgement exchange property.  Additionally, the type
 of acknowledgement that will be generated can be controlled by setting
 the CamelMllpAcknowledgementType exchange property.
 
@@ -203,25 +203,25 @@ The MLLP Consumer adds these headers on the Camel message:
 [width="100%",cols="<34%,<33%,<33%",]
 |===========================================
 |*Key* |*Description* |
-|CamelMllpLocalAddress | The local TCP Address of the Socket |
-|CamelMllpRemoteAddress | The local TCP Address of the Socket |
+|CamelMllpLocalAddress | The local TCP Address of the Socket |
+|CamelMllpRemoteAddress | The local TCP Address of the Socket |
 |CamelMllpSendingApplication | MSH-3 value |
 |CamelMllpSendingFacility | MSH-4 value |
 |CamelMllpReceivingApplication | MSH-5 value |
 |CamelMllpReceivingFacility | MSH-6 value |
 |CamelMllpTimestamp | MSH-7 value |
-|CamelMllpSecurity | MSH-8 value |
-|CamelMllpMessageType | MSH-9 value |
-|CamelMllpEventType | MSH-9-1 value |
-|CamelMllpTriggerEvent | MSH-9-2 value |
-|CamelMllpMessageControlId | MSH-10 value |
-|CamelMllpProcessingId | MSH-11 value |
-|CamelMllpVersionId | MSH-12 value |
-|CamelMllpCharset | MSH-18 value |
+|CamelMllpSecurity | MSH-8 value |
+|CamelMllpMessageType | MSH-9 value |
+|CamelMllpEventType | MSH-9-1 value |
+|CamelMllpTriggerEvent | MSH-9-2 value |
+|CamelMllpMessageControlId | MSH-10 value |
+|CamelMllpProcessingId | MSH-11 value |
+|CamelMllpVersionId | MSH-12 value |
+|CamelMllpCharset | MSH-18 value |
 |===========================================
 
-All headers are String types. If a header value is missing, its value
-is null.
+All headers are String types. If a header value is missing, its value
+is null.
 
 == *Exchange Properties*
 
@@ -231,10 +231,10 @@ by these properties on the Camel exchange:
 [width="100%",cols="<34%,<33%,<33%",]
 |====================================
 |*Key* |*Type* |*Description*
-|CamelMllpAcknowledgement | byte[] | If present, this property will we sent to client as the MLLP Acknowledgement
-|CamelMllpAcknowledgementString | String | If present and CamelMllpAcknowledgement is not present, this property will we sent to client as the MLLP Acknowledgement
+|CamelMllpAcknowledgement | byte[] | If present, this property will we sent to client as the MLLP Acknowledgement
+|CamelMllpAcknowledgementString | String | If present and CamelMllpAcknowledgement is not present, this property will we sent to client as the MLLP Acknowledgement
 |CamelMllpAcknowledgementMsaText | String | If neither CamelMllpAcknowledgement or CamelMllpAcknowledgementString are present and autoAck is true, this property can be used to specify the contents of MSA-3 in the generated HL7 acknowledgement
-|CamelMllpAcknowledgementType | String  | If neither CamelMllpAcknowledgement or CamelMllpAcknowledgementString are present and autoAck is true, this property can be used to specify the HL7 acknowledgement type (i.e. AA, AE, AR)
+|CamelMllpAcknowledgementType | String  | If neither CamelMllpAcknowledgement or CamelMllpAcknowledgementString are present and autoAck is true, this property can be used to specify the HL7 acknowledgement type (i.e. AA, AE, AR)
 |CamelMllpAutoAcknowledge | Boolean | Overrides the autoAck query parameter
 
 |CamelMllpCloseConnectionBeforeSend | Boolean | If true, the Socket will be closed before sending data
@@ -249,9 +249,9 @@ by these properties on the Camel exchange:
 == MLLP Producer
 
 The MLLP Producer supports sending MLLP-framed messages and receiving
-HL7 Acknowledgements.  The MLLP Producer interrogates the HL7
+HL7 Acknowledgements.  The MLLP Producer interrogates the HL7
 Acknowledgments and raises exceptions if a negative acknowledgement is
-received.  The received acknowledgement is interrogated and an exception
+received.  The received acknowledgement is interrogated and an exception
 is raised in the event of a negative acknowledgement.
 
 == *Message Headers*
@@ -261,11 +261,11 @@ The MLLP Producer adds these headers on the Camel message:
 [width="100%",cols="<34%,<33%,<33%",]
 |===================================
 |*Key* |*Description* |
-|CamelMllpLocalAddress | The local TCP Address of the Socket | 
-|CamelMllpRemoteAddress | The remote TCP Address of the Socket | 
-|CamelMllpAcknowledgement | The HL7 Acknowledgment byte[] received | 
-|CamelMllpAcknowledgementString | The HL7 Acknowledgment received, converted to a String | 
-|CamelMllpAcknowledgementType | The HL7 acknowledgement type (AA, AE, AR, etc)
+|CamelMllpLocalAddress | The local TCP Address of the Socket | 
+|CamelMllpRemoteAddress | The remote TCP Address of the Socket | 
+|CamelMllpAcknowledgement | The HL7 Acknowledgment byte[] received | 
+|CamelMllpAcknowledgementString | The HL7 Acknowledgment received, converted to a String | 
+|CamelMllpAcknowledgementType | The HL7 acknowledgement type (AA, AE, AR, etc)
 |===================================
 
 == *Exchange Properties*
diff --git a/components/camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc b/components/camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc
index 078a044..5c1defc 100644
--- a/components/camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc
+++ b/components/camel-mongodb-gridfs/src/main/docs/mongodb-gridfs-component.adoc
@@ -153,7 +153,7 @@ xref:mongodb-gridfs-component.adoc[*findOne*] on a collection.
 </route>
 ----------------------------------------------------------------------------------
 
- 
+ 
 
 == GridFS operations - producer endpoint
 
@@ -192,12 +192,12 @@ filename1.txt   1252314321
 filename2.txt   2897651254
 ----------------------------------------------------------------------------------
 
- 
+ 
 
 === *findOne*
 
 Finds a file in the GridFS system and sets the body to an InputStream of
-the content.   Also provides the metadata has headers.  It uses
+the content.   Also provides the metadata has headers.  It uses
 Exchange.FILE_NAME from the incoming headers to determine the file to
 find.
 
@@ -209,7 +209,7 @@ headers.put(Exchange.FILE_NAME, "filename.txt");
 InputStream result = template.requestBodyAndHeaders("direct:findOne", "irrelevantBody", headers);
 -------------------------------------------------------------------------------------------------
 
- 
+ 
 
 === create
 
diff --git a/components/camel-mongodb/src/main/docs/mongodb-component.adoc b/components/camel-mongodb/src/main/docs/mongodb-component.adoc
index c5b4861..77a81fe 100644
--- a/components/camel-mongodb/src/main/docs/mongodb-component.adoc
+++ b/components/camel-mongodb/src/main/docs/mongodb-component.adoc
@@ -359,8 +359,8 @@ You can provide a query
 *The query object is extracted `CamelMongoDbCriteria` header*.
 if the CamelMongoDbCriteria header is null the query object is extracted 
 message body, i.e. it should be of type `Bson` or convertible to
-`Bson`., and
-operation will return the amount of documents matching this criteria.  
+`Bson`., and
+operation will return the amount of documents matching this criteria.  
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------
@@ -474,8 +474,8 @@ expected to ensure at the application level that is unique (and this is
 a good practice too).
 
 OID(s) of the inserted record(s) is stored in the
-message header under `CamelMongoOid` key (`MongoDbConstants.OID`
-constant). The value stored is `org.bson.types.ObjectId` for single
+message header under `CamelMongoOid` key (`MongoDbConstants.OID`
+constant). The value stored is `org.bson.types.ObjectId` for single
 insert or `java.util.List<org.bson.types.ObjectId>` if multiple records
 have been inserted.
 
@@ -997,7 +997,7 @@ camel-mongodb component provides the following conversions:
 constructor.
 |fromDocumentToMap |`Document` |`Map` |`Document` already implements `Map`.
 |fromStringToDocument |`String` |`Document` |uses `com.mongodb.Document.parse(String s)`.
-|fromAnyObjectToDocument |`Object`  |`Document` |uses the http://jackson.codehaus.org/[Jackson library] to convert the
+|fromAnyObjectToDocument |`Object`  |`Document` |uses the http://jackson.codehaus.org/[Jackson library] to convert the
 object to a `Map`, which is in turn used to initialise a new
 `Document`.
 |fromStringToList |`String` |`List<Bson>` |uses `org.bson.codecs.configuration.CodecRegistries` to convert to BsonArray then to List<Bson>.
diff --git a/components/camel-mybatis/src/main/docs/mybatis-component.adoc b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
index 55e0656..514a395 100644
--- a/components/camel-mybatis/src/main/docs/mybatis-component.adoc
+++ b/components/camel-mybatis/src/main/docs/mybatis-component.adoc
@@ -308,7 +308,7 @@ dynamic queries] capabilities.
 === Scheduled polling example
 
 This component supports scheduled polling and can therefore be used as
-a Polling Consumer. For example to poll the
+a Polling Consumer. For example to poll the
 database every minute:
 
 [source,java]
@@ -318,11 +318,11 @@ from("mybatis:selectAllAccounts?delay=60000")
 ----
 
 See "ScheduledPollConsumer Options"
-on Polling Consumer for more options.
+on Polling Consumer for more options.
 
 Alternatively you can use another mechanism for triggering the scheduled
 polls, such as the xref:timer-component.adoc[Timer] or xref:timer-component.adoc[Quartz]
-components. In the sample below we poll the database, every 30 seconds
+components. In the sample below we poll the database, every 30 seconds
 using the xref:timer-component.adoc[Timer] component and send the data to the JMS
 queue:
 
diff --git a/components/camel-nats/src/main/docs/nats-component.adoc b/components/camel-nats/src/main/docs/nats-component.adoc
index 9438243..fa32957 100644
--- a/components/camel-nats/src/main/docs/nats-component.adoc
+++ b/components/camel-nats/src/main/docs/nats-component.adoc
@@ -3,10 +3,10 @@
 
 *Available as of Camel version 2.17*
 
-http://nats.io/[NATS] is a fast and reliable messaging platform.
+http://nats.io/[NATS] is a fast and reliable messaging platform.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component.
+their `pom.xml` for this component.
 
 [source,xml]
 ------------------------------------------------------------
@@ -25,7 +25,7 @@ their `pom.xml` for this component.
 nats:servers[?options]
 ----------------------
 
-Where *servers* represents the list of NATS servers.
+Where *servers* represents the list of NATS servers.
 
 == Options
 
@@ -144,7 +144,7 @@ The component supports 4 options, which are listed below.
 
 |CamelNatsMessageTimestamp |long |The timestamp of a consumed message.
 |=======================================================================
- 
+ 
 *Producer example:*
 
 [source,java]
diff --git a/components/camel-netty-http/src/main/docs/netty-http-component.adoc b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
index 8f77242..823f991 100644
--- a/components/camel-netty-http/src/main/docs/netty-http-component.adoc
+++ b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.14*
 
-The Netty HTTP component is an extension to xref:netty-component.adoc[Netty]
+The Netty HTTP component is an extension to xref:netty-component.adoc[Netty]
 component to facilitiate HTTP transport with xref:netty-component.adoc[Netty].
 
 This camel component supports both producer and consumer endpoints.
@@ -78,9 +78,9 @@ at the endpoint URI definition level (like `to` or `from` DSL elements).
 
 This component inherits all the options from
 xref:netty-component.adoc[Netty], so make sure to look at
-the xref:netty-component.adoc[Netty] documentation as well.
-Notice that some options from xref:netty-component.adoc[Netty] is not
-applicable when using this Netty4 HTTP component, such as options
+the xref:netty-component.adoc[Netty] documentation as well.
+Notice that some options from xref:netty-component.adoc[Netty] is not
+applicable when using this Netty4 HTTP component, such as options
 related to UDP transport.
 ====
 
@@ -365,7 +365,7 @@ This component uses the
 `org.apache.camel.component.netty4.http.NettyHttpMessage` as the message
 implementation on the Exchange. This allows end
 users to get access to the original Netty request/response instances if
-needed, as shown below. Mind that the original response may not be
+needed, as shown below. Mind that the original response may not be
 accessible at all times.
 
 [source,java]
diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index 2559740..8e79854 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -407,9 +407,9 @@ Using the JSSE Configuration Utility
 
 The Netty component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the Netty component.
 
 [[Netty-Programmaticconfigurationofthecomponent]]
@@ -661,7 +661,7 @@ A custom pipeline factory must be constructed as follows
 * A Producer linked channel pipeline factory must extend the abstract
 class `ClientPipelineFactory`.
 * A Consumer linked channel pipeline factory must extend the abstract
-class `ServerInitializerFactory`.
+class `ServerInitializerFactory`.
 * The classes should override the initChannel() method in order to
 insert custom handler(s), encoder(s) and decoder(s). Not overriding the
 `initChannel()` method creates a pipeline with no handlers, encoders or
diff --git a/components/camel-nsq/src/main/docs/nsq-component.adoc b/components/camel-nsq/src/main/docs/nsq-component.adoc
index 5fe6699..18ed8fe 100644
--- a/components/camel-nsq/src/main/docs/nsq-component.adoc
+++ b/components/camel-nsq/src/main/docs/nsq-component.adoc
@@ -3,10 +3,10 @@
 
 *Available as of Camel version 2.23*
 
-http://nsq.io/[NSQ] is a realtime distributed messaging platform.
+http://nsq.io/[NSQ] is a realtime distributed messaging platform.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component.
+their `pom.xml` for this component.
 
 [source,xml]
 ------------------------------------------------------------
@@ -25,7 +25,7 @@ their `pom.xml` for this component.
 nsq:servers[?options]
 ----------------------
 
-Where *servers* represents the list of NSQ servers - nsqlookupd servers in the case of a consumer and nsqd servers in the case of a producer.
+Where *servers* represents the list of NSQ servers - nsqlookupd servers in the case of a consumer and nsqd servers in the case of a producer.
 
 == Options
 
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
index ce2f3a6..e6a0570 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc
@@ -3,8 +3,8 @@
 
 *Available as of Camel version 2.14*
 
-The Olingo2 component utilizes http://olingo.apache.org/[Apache Olingo]
-version 2.0 APIs to interact with OData 2.0 compliant services.
+The Olingo2 component utilizes http://olingo.apache.org/[Apache Olingo]
+version 2.0 APIs to interact with OData 2.0 compliant services.
 A number of popular commercial and enterprise vendors and products
 support the OData protocol. A sample list of supporting products can be
 found on the OData http://www.odata.org/ecosystem/[website].
@@ -13,11 +13,11 @@ The Olingo2 component supports reading feeds, delta feeds, entities,
 simple and complex properties, links, counts, using custom and OData
 system query parameters. It supports updating entities, properties, and
 association links. It also supports submitting queries and change
-requests as a single OData batch operation. 
+requests as a single OData batch operation. 
 
 The component supports configuring HTTP connection parameters and
-headers for OData service connection. This allows configuring use of
-SSL, OAuth2.0, etc. as required by the target OData service. 
+headers for OData service connection. This allows configuring use of
+SSL, OAuth2.0, etc. as required by the target OData service. 
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -153,20 +153,20 @@ The component supports 16 options, which are listed below.
 == Producer Endpoints
 
 Producer endpoints can use endpoint names and options listed
-next. Producer endpoints can also use a special option *`inBody`* that
+next. Producer endpoints can also use a special option *`inBody`* that
 in turn should contain the name of the endpoint option whose value will
-be contained in the Camel Exchange In message. The *inBody* option
-defaults to *data* for endpoints that take that option. 
+be contained in the Camel Exchange In message. The *inBody* option
+defaults to *data* for endpoints that take that option. 
 
 == Endpoint Options
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelOlingo2.<option>`*. Note that the *`inBody`* option
+the format *`CamelOlingo2.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override
-a *`CamelOlingo2.option`* header. In addition, query parameters can be
-specified. 
+option *`inBody=option`* would override
+a *`CamelOlingo2.option`* header. In addition, query parameters can be
+specified. 
 
 [width="100%",cols="10%,20%,70%",options="header",]
 |=======================================================================
@@ -185,9 +185,9 @@ Note that the resourcePath option can either in specified in the URI as
 a part of the URI path, as an endpoint option
 ?resourcePath=<resource-path> or as a header value
 CamelOlingo2.resourcePath. The OData entity key predicate can either be
-a part of the resource path, e.g. _Manufacturers('1')_, where _'__1'_ is
+a part of the resource path, e.g. _Manufacturers('1')_, where _'__1'_ is
 the key predicate, or be specified separately with resource path
-_Manufacturers_ and keyPredicate option _'1'_. 
+_Manufacturers_ and keyPredicate option _'1'_. 
 
 [width="100%",cols="10%,10%,10%,70%",options="header",]
 |=======================================================================
@@ -221,7 +221,7 @@ Both properties are of the type *`java.util.Map<String, String>`*.
 == OData Resource Type Mapping
 
 The result of *read* endpoint and data type of *data* option depends on
-the OData resource being queried, created or modified. 
+the OData resource being queried, created or modified. 
 
 [width="100%",cols="10%,10%,80%",options="header",]
 |=======================================================================
@@ -255,24 +255,24 @@ java.util.List<java.util.Map<String, Object>> containing list of key property na
 
 Only the *read* endpoint 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
+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
 collection will generate one exchange per element, and their routes will
 be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*. 
+setting the endpoint property *consumer.splitResult=false*. 
 
 == Message Headers
 
 Any URI option can be provided in a message header for producer
-endpoints with a *`CamelOlingo2.`* prefix.
+endpoints with a *`CamelOlingo2.`* prefix.
 
 == Message Body
 
 All result message bodies utilize objects provided by the underlying
 http://olingo.apache.org/javadoc/odata2/index.html[Apache Olingo 2.0
 API] used by the Olingo2Component. Producer endpoints can specify the
-option name for incoming message body in the *`inBody`* endpoint URI
+option name for incoming message body in the *`inBody`* endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
 endpoint will map every element to distinct messages, unless
 *consumer.splitResult* is set to *false*.
@@ -280,9 +280,9 @@ endpoint will map every element to distinct messages, unless
 == Use cases
 
 The following route reads top 5 entries from the Manufacturer feed
-ordered by ascending Name property. 
+ordered by ascending Name property. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
@@ -291,12 +291,12 @@ from("direct:...")
     .to("olingo2://read/Manufacturers?orderBy=Name%20asc");
 ------------------------------------------------------------
 
- 
+ 
 
 The following route reads Manufacturer entry using the key property
-value in incoming *id* header. 
+value in incoming *id* header. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
@@ -305,12 +305,12 @@ from("direct:...")
     .to("olingo2://read/Manufacturers");
 ------------------------------------------------------------
 
- 
+ 
 
 The following route creates Manufacturer entry using the
-*java.util.Map<String, Object>* in body message. 
+*java.util.Map<String, Object>* in body message. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
@@ -318,17 +318,17 @@ from("direct:...")
     .to("olingo2://create/Manufacturers");
 ------------------------------------------------------------
 
- 
+ 
 
 The following route polls Manufacturer
 http://olingo.apache.org/doc/tutorials/deltaClient.html[delta
-feed] every 30 seconds. The bean *blah* updates the bean *paramsBean* to
-add an updated *!deltatoken* property with the value returned in the
+feed] every 30 seconds. The bean *blah* updates the bean *paramsBean* to
+add an updated *!deltatoken* property with the value returned in the
 *ODataDeltaFeed* result. Since the initial delta token is not known, the
-consumer endpoint will produce an *ODataFeed* value the first time, and
-*ODataDeltaFeed* on subsequent polls. 
+consumer endpoint will produce an *ODataFeed* value the first time, and
+*ODataDeltaFeed* on subsequent polls. 
 
- 
+ 
 
 [source,java]
 ---------------------------------------------------------------------------------------------------------
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
index f24a0e1..7d7534d 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/docs/olingo4-component.adoc
@@ -3,8 +3,8 @@
 
 *Available as of Camel version 2.19*
 
-The Olingo4 component utilizes http://olingo.apache.org/[Apache Olingo]
-version 4.0 APIs to interact with OData 4.0 compliant service.
+The Olingo4 component utilizes http://olingo.apache.org/[Apache Olingo]
+version 4.0 APIs to interact with OData 4.0 compliant service.
 Since version 4.0 OData is OASIS standard and number of popular open source 
 and commercial vendors and products support this protocol.
 A sample list of supporting products can be found on the OData 
@@ -13,11 +13,11 @@ http://www.odata.org/ecosystem/[website].
 The Olingo4 component supports reading entity sets, entities,
 simple and complex properties, counts, using custom and OData
 system query parameters. It supports updating entities and properties.
-It also supports submitting queries and change requests as a single OData batch operation. 
+It also supports submitting queries and change requests as a single OData batch operation. 
 
 The component supports configuring HTTP connection parameters and
-headers for OData service connection. This allows configuring use of
-SSL, OAuth2.0, etc. as required by the target OData service. 
+headers for OData service connection. This allows configuring use of
+SSL, OAuth2.0, etc. as required by the target OData service. 
 
 Maven users will need to add the following dependency to their pom.xml
 for this component:
@@ -154,26 +154,26 @@ The component supports 16 options, which are listed below.
 == Producer Endpoints
 
 Producer endpoints can use endpoint names and options listed
-next. Producer endpoints can also use a special option *`inBody`* that
+next. Producer endpoints can also use a special option *`inBody`* that
 in turn should contain the name of the endpoint option whose value will
-be contained in the Camel Exchange In message. The *inBody* option
-defaults to *data* for endpoints that take that option. 
+be contained in the Camel Exchange In message. The *inBody* option
+defaults to *data* for endpoints that take that option. 
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelOlingo4.<option>`*. Note that the *`inBody`* option
+the format *`CamelOlingo4.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override
-a *`CamelOlingo4.option`* header. In addition, query parameters can be
-specified 
+option *`inBody=option`* would override
+a *`CamelOlingo4.option`* header. In addition, query parameters can be
+specified 
 
 Note that the resourcePath option can either in specified in the URI as
 a part of the URI path, as an endpoint option
 ?resourcePath=<resource-path> or as a header value
 CamelOlingo4.resourcePath. The OData entity key predicate can either be
-a part of the resource path, e.g. _Manufacturers('1')_, where _'__1'_ is
+a part of the resource path, e.g. _Manufacturers('1')_, where _'__1'_ is
 the key predicate, or be specified separately with resource path
-_Manufacturers_ and keyPredicate option _'1'_. 
+_Manufacturers_ and keyPredicate option _'1'_. 
 
 [width="100%",cols="10%,10%,10%,70%",options="header",]
 |=======================================================================
@@ -207,7 +207,7 @@ Both properties are of the type *`java.util.Map<String, String>`*.
 == OData Resource Type Mapping
 
 The result of *read* endpoint and data type of *data* option depends on
-the OData resource being queried, created or modified. 
+the OData resource being queried, created or modified. 
 
 [width="100%",cols="10%,10%,80%",options="header",]
 |=======================================================================
@@ -235,24 +235,24 @@ java.util.Map<String, Object> for In body (request)
 
 Only the *read* endpoint 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
+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
 collection will generate one exchange per element, and their routes will
 be executed once for each exchange. This behavior can be disabled by
-setting the endpoint property *consumer.splitResult=false*. 
+setting the endpoint property *consumer.splitResult=false*. 
 
 == Message Headers
 
 Any URI option can be provided in a message header for producer
-endpoints with a *`CamelOlingo4.`* prefix.
+endpoints with a *`CamelOlingo4.`* prefix.
 
 == Message Body
 
 All result message bodies utilize objects provided by the underlying
 http://olingo.apache.org/javadoc/odata4/index.html[Apache Olingo 4.0
 API] used by the Olingo4Component. Producer endpoints can specify the
-option name for incoming message body in the *`inBody`* endpoint URI
+option name for incoming message body in the *`inBody`* endpoint URI
 parameter. For endpoints that return an array or collection, a consumer
 endpoint will map every element to distinct messages, unless
 *consumer.splitResult* is set to *false*.
@@ -260,9 +260,9 @@ endpoint will map every element to distinct messages, unless
 == Use cases
 
 The following route reads top 5 entries from the People entity
-ordered by ascending FirstName property. 
+ordered by ascending FirstName property. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
@@ -271,12 +271,12 @@ from("direct:...")
     .to("olingo4://read/People?orderBy=FirstName%20asc");
 ------------------------------------------------------------
 
- 
+ 
 
 The following route reads Airports entity using the key property
-value in incoming *id* header. 
+value in incoming *id* header. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
@@ -285,12 +285,12 @@ from("direct:...")
     .to("olingo4://read/Airports");
 ------------------------------------------------------------
 
- 
+ 
 
 The following route creates People entity using the
-*ClientEntity* in body message. 
+*ClientEntity* in body message. 
 
- 
+ 
 
 [source,java]
 ------------------------------------------------------------
diff --git a/components/camel-openstack/src/main/docs/openstack.adoc b/components/camel-openstack/src/main/docs/openstack.adoc
index 86e64a8..3a5a70a 100644
--- a/components/camel-openstack/src/main/docs/openstack.adoc
+++ b/components/camel-openstack/src/main/docs/openstack.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel 2.19*
 
 The Openstack component is a component for managing your
-https://www.openstack.org//[OpenStack] applications. 
+https://www.openstack.org//[OpenStack] applications. 
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc b/components/camel-opentracing/src/main/docs/opentracing.adoc
index 3b5cac2..37e531a 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -61,8 +61,8 @@ OpenTracing tracer beans. Camel will automatically discover and use them.
 
 == Spring Boot
 
-If you are using Spring Boot then you can add
-the `camel-opentracing-starter` dependency, and turn on OpenTracing by annotating
+If you are using Spring Boot then you can add
+the `camel-opentracing-starter` dependency, and turn on OpenTracing by annotating
 the main class with `@CamelOpenTracing`.
 
 The `Tracer` will be implicitly obtained from the camel context's `Registry`, or the `ServiceLoader`, unless
diff --git a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
index 64d6310..98aa5e4 100644
--- a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
+++ b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
@@ -165,7 +165,7 @@ The solving will take as long as specified in the `solverConfig`.
 <solver>
 -----------------------------------------------------------------------------
 
- 
+ 
 
 === Samples
 
diff --git a/components/camel-paho/src/main/docs/paho-component.adoc b/components/camel-paho/src/main/docs/paho-component.adoc
index 3e1a0dc..ab08700 100644
--- a/components/camel-paho/src/main/docs/paho-component.adoc
+++ b/components/camel-paho/src/main/docs/paho-component.adoc
@@ -174,10 +174,10 @@ byte[] payload = "message".getBytes();
 producerTemplate.sendBody("paho:topic", payload);
 ----
 
-But of course Camel build-in xref:manual::type-converter.adoc[type conversion
+But of course Camel build-in xref:manual::type-converter.adoc[type conversion
 API] can perform the automatic data type transformations for you. In the
 example below Camel automatically converts binary payload into `String`
-(and conversely):
+(and conversely):
 
 [source,java]
 ----
@@ -209,7 +209,7 @@ from("direct:test")
     .to("paho:some/target/queue");
 ----
 
-For example this is how to read messages from the remote MQTT broker: 
+For example this is how to read messages from the remote MQTT broker: 
 
 [source]
 ----
diff --git a/components/camel-pdf/src/main/docs/pdf-component.adoc b/components/camel-pdf/src/main/docs/pdf-component.adoc
index 0e1c095..d9c5b6d 100644
--- a/components/camel-pdf/src/main/docs/pdf-component.adoc
+++ b/components/camel-pdf/src/main/docs/pdf-component.adoc
@@ -9,7 +9,7 @@ https://pdfbox.apache.org/[Apache PDFBox] as underlying library to work
 with PDF documents.
 
 In order to use the PDF component, Maven users will need to add the
-following dependency to their `pom.xml`:
+following dependency to their `pom.xml`:
 
 *pom.xml*
 
@@ -145,5 +145,5 @@ https://pdfbox.apache.org/docs/1.8.10/javadocs/org/apache/pdfbox/pdmodel/encrypt
 * Getting Started
 
 -
- 
+ 
 -
diff --git a/components/camel-properties/src/main/docs/properties-component.adoc b/components/camel-properties/src/main/docs/properties-component.adoc
index 6153b37..71bdf2e 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -158,7 +158,7 @@ You can use property placeholders in parts of the endpoint URI's which
 for example you can use placeholders for parameters in the URIs.
 
 You can specify a default value to use if
-a property with the key does not exists, eg `file.url:/some/path` where
+a property with the key does not exists, eg `file.url:/some/path` where
 the default value is the text after the colon (eg /some/path).
 
 NOTE: Do not use colon in the property key. The colon is used as a separator
@@ -738,7 +738,7 @@ private int timeout;
 
 == Using out of the box functions
 
-The xref:properties-component.adoc[Properties] component includes the following
+The xref:properties-component.adoc[Properties] component includes the following
 functions out of the box
 
 * `env` - A function to lookup the property from OS environment variables
@@ -747,10 +747,10 @@ properties
 * `service` - A function to lookup the property from OS environment
 variables using the service naming idiom
 * `service.name` - A function to lookup the
-property from OS environment variables using the service naming idiom
+property from OS environment variables using the service naming idiom
 returning the hostname part only
-* `service.port` - A function to lookup the
-property from OS environment variables using the service naming idiom
+* `service.port` - A function to lookup the
+property from OS environment variables using the service naming idiom
 returning the port part only
 
 As you can see these functions is intended to make it easy to lookup
@@ -785,7 +785,7 @@ is a `log:foo` and `log:bar` value.
   </camelContext>
 ----
 
- 
+ 
 
 The service function is for looking up a service which is defined using
 OS environment variables using the service naming idiom, to refer to a
@@ -806,7 +806,7 @@ export $FOO_SERVICE_PORT=8888
 
 For example if the FOO service a remote HTTP service, then we can refer
 to the service in the Camel endpoint uri, and use
-the xref:http-component.adoc[HTTP] component to make the HTTP call:
+the xref:http-component.adoc[HTTP] component to make the HTTP call:
 
 [source,xml]
 ----
@@ -834,7 +834,7 @@ example to call a service on localhost, maybe for unit testing etc
 == Using custom functions
 
 The xref:properties-component.adoc[Properties] component allow to plugin 3rd party
-functions which can be used during parsing of the property placeholders.
+functions which can be used during parsing of the property placeholders.
 These functions are then able to do custom logic to resolve the
 placeholders, such as looking up in databases, do custom computations,
 or whatnot. The name of the function becomes the prefix used in the
@@ -884,9 +884,9 @@ public static final class MyBeerFunction implements PropertiesFunction {
 ----
 
 The function must implement
-the `org.apache.camel.component.properties.PropertiesFunction`
-interface. The method `getName` is  the name of the function, eg beer.
-And the `apply` method is where we implement the custom logic to do. As
+the `org.apache.camel.component.properties.PropertiesFunction`
+interface. The method `getName` is  the name of the function, eg beer.
+And the `apply` method is where we implement the custom logic to do. As
 the sample code is from an unit test, it just returns a value to refer
 to a mock endpoint.
 
@@ -897,7 +897,7 @@ To register a custom function from Java code is as shown below:
 PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
 pc.addFunction(new MyBeerFunction());
 ----
- 
+ 
 
 == Using 3rd-party properties sources
 
diff --git a/components/camel-pulsar/src/main/docs/pulsar-component.adoc b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
index 54017e7..e6d9ec5 100644
--- a/components/camel-pulsar/src/main/docs/pulsar-component.adoc
+++ b/components/camel-pulsar/src/main/docs/pulsar-component.adoc
@@ -5,7 +5,7 @@
 
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component.
+their `pom.xml` for this component.
 
 [source,xml]
 ------------------------------------------------------------
diff --git a/components/camel-quickfix/src/main/docs/quickfix-component.adoc b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
index d18a363..10f9241 100644
--- a/components/camel-quickfix/src/main/docs/quickfix-component.adoc
+++ b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
@@ -42,7 +42,7 @@ the sessionID is:
 The optional *lazyCreateEngine* parameter allows to
 create QuickFIX/J engine on demand. Value *true* means the engine is
 started when first message is send or there's consumer configured in
-route definition. When **false** value is used, the engine is started at
+route definition. When **false** value is used, the engine is started at
 the endpoint creation. When this parameter is missing, the value of
 component's property *lazyCreateEngines* is being used.
 
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index 52de565..939fbbc 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -338,7 +338,7 @@ the exchange failed, then the consumer is going to reject the message
 from the RabbitMQ broker. The value of this header controls this
 behavior. If the value is false (by default) then the message is
 discarded/dead-lettered. If the value is true, then the message is
-re-queued. 
+re-queued. 
 |===
 
 The following headers are used by the producer. If these are set on the
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc b/components/camel-rest/src/main/docs/rest-component.adoc
index f103ca3..2d0505e 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -141,7 +141,7 @@ The following components support rest producer:
 == Path and uriTemplate syntax
 
 The path and uriTemplate option is defined using a REST syntax where you
-define the REST context path using support for parameters. 
+define the REST context path using support for parameters. 
 
 TIP:If no uriTemplate is configured then path option works the same way. It
 does not matter if you configure only path or if you configure both
@@ -274,13 +274,13 @@ IMPORTANT: You must configure `outType` option if you want POJO binding to happe
 
 == More examples
 
-See Rest DSL which offers more examples and how you
+See Rest DSL which offers more examples and how you
 can use the Rest DSL to define those in a nicer RESTful way.
 
 There is a *camel-example-servlet-rest-tomcat* example in the Apache
 Camel distribution, that demonstrates how to use the
-Rest DSL with SERVLET as
-transport that can be deployed on Apache Tomcat, or similar web
+Rest DSL with SERVLET as
+transport that can be deployed on Apache Tomcat, or similar web
 containers.
 
 == See Also
diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc b/components/camel-restlet/src/main/docs/restlet-component.adoc
index c0c6e37..b560ff2 100644
--- a/components/camel-restlet/src/main/docs/restlet-component.adoc
+++ b/components/camel-restlet/src/main/docs/restlet-component.adoc
@@ -208,7 +208,7 @@ application/processor. The value is the `content-type` of the response
 message. If this header is not set, the content type is based on the
 object type of the OUT message body. If the
 Content-Type header is specified in the Camel IN message, the value of
-the header determine the content type for the Restlet request message.  
+the header determine the content type for the Restlet request message.  
 Otherwise, it is defaulted to "application/x-www-form-urlencoded'.
 
 |`CamelAcceptContentType` |`String` |The HTTP Accept request header.
diff --git a/components/camel-saxon/src/main/docs/xquery-language.adoc b/components/camel-saxon/src/main/docs/xquery-language.adoc
index 792cb5b..6cb3a21 100644
--- a/components/camel-saxon/src/main/docs/xquery-language.adoc
+++ b/components/camel-saxon/src/main/docs/xquery-language.adoc
@@ -167,7 +167,7 @@ from("direct:start").
    transform().xquery("/people/person/text()", String.class);
 -------------------------------------------------------------
 
- 
+ 
 
 == Using XQuery as an endpoint
 
diff --git a/components/camel-scheduler/src/main/docs/scheduler-component.adoc b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
index b085407..251fc6e 100644
--- a/components/camel-scheduler/src/main/docs/scheduler-component.adoc
+++ b/components/camel-scheduler/src/main/docs/scheduler-component.adoc
@@ -5,9 +5,9 @@
 
 The Scheduler component is used to generate message exchanges when a
 scheduler fires. This component is similar to the
- xref:timer-component.adoc[Timer] component, but it offers more functionality in
+ xref:timer-component.adoc[Timer] component, but it offers more functionality in
 terms of scheduling. Also this component uses
-JDK `ScheduledExecutorService`. Where as the timer uses a JDK `Timer`.
+JDK `ScheduledExecutorService`. Where as the timer uses a JDK `Timer`.
 
 You can only consume events from this endpoint.
 
@@ -20,7 +20,7 @@ scheduler:name[?options]
 
 Where `name` is the name of the scheduler, which is created and shared
 across endpoints. So if you use the same name for all your scheduler
-endpoints, only one scheduler thread pool and thread will be used - but
+endpoints, only one scheduler thread pool and thread will be used - but
 you can configure the thread pool to allow more concurrent threads.
 
 You can append query options to the URI in the following format,
@@ -128,10 +128,10 @@ The component supports 4 options, which are listed below.
 == More information
 
 This component is a scheduler
-http://camel.apache.org/polling-consumer.html[Polling Consumer] where
+http://camel.apache.org/polling-consumer.html[Polling Consumer] where
 you can find more information about the options above, and examples at
 the http://camel.apache.org/polling-consumer.html[Polling
-Consumer] page.
+Consumer] page.
 
 == Exchange Properties
 
@@ -182,9 +182,9 @@ There can be use cases where you want the scheduler to trigger and be
 greedy. But sometimes you want "tell the scheduler" that there was no
 task to poll, so the scheduler can change into idle mode using the
 backoff options. To do this you would need to set a property on the
-exchange with the key `Exchange.SCHEDULER_POLLED_MESSAGES` to a boolean
+exchange with the key `Exchange.SCHEDULER_POLLED_MESSAGES` to a boolean
 value of false. This will cause the consumer to indicate that there was
-no messages polled. 
+no messages polled. 
 
 The consumer will otherwise as by default return 1 message polled to the
 scheduler, every time the consumer has completed processing the
diff --git a/components/camel-schematron/src/main/docs/schematron-component.adoc b/components/camel-schematron/src/main/docs/schematron-component.adoc
index 1ff12b4..86aad92 100644
--- a/components/camel-schematron/src/main/docs/schematron-component.adoc
+++ b/components/camel-schematron/src/main/docs/schematron-component.adoc
@@ -3,11 +3,11 @@
 
 *Available as of Camel version 2.15*
 
-http://www.schematron.com/index.html[Schematron] is an XML-based
+http://www.schematron.com/index.html[Schematron] is an XML-based
 language for validating XML instance documents. It is used to make
 assertions about data in an XML document and it is also used to express
 operational and business rules. Schematron is
-an http://standards.iso.org/ittf/PubliclyAvailableStandards/index.html[ISO
+an http://standards.iso.org/ittf/PubliclyAvailableStandards/index.html[ISO
 Standard]. The schematron component uses the leading
 http://www.schematron.com/implementation.html[implementation] of ISO
 schematron. It is an XSLT based implementation. The schematron rules is
@@ -132,7 +132,7 @@ Java DSL. The schematron rules file is sourced from the class path:
 from("direct:start").to("schematron://sch/schematron.sch").to("mock:result")
 ----------------------------------------------------------------------------
 
- 
+ 
 
 The following example shows how to invoke the schematron processor in
 XML DSL. The schematrion rules file is sourced from the file system:
@@ -163,11 +163,11 @@ TIP: *Where to store schematron rules?*
 Schematron rules can change with business requirement, as such it is
 recommended to store these rules somewhere in file system. When the
 schematron component endpoint is started, the rules are compiled into
-XSLT as a  Java Templates Object. This is done only once to minimise the
+XSLT as a  Java Templates Object. This is done only once to minimise the
 overhead of instantiating Java Templates object, which can be an
 expensive operation for large set of rules and given that the process
 goes through four pipelines
-of http://www.schematron.com/implementation.html[XSLT transformations].
+of http://www.schematron.com/implementation.html[XSLT transformations].
 So if you happen to store the rules in the file system, in the event of
 an update, all you need is to restart the route or the component. No
 harm in storing these rules in the class path though, but you will have
@@ -219,7 +219,7 @@ Here is an example of schematron report:
 
 TIP: *Useful Links and resources*
 * http://www.mulberrytech.com/papers/schematron-Philly.pdf[Introduction
-to Schematron] by Mulleberry technologies. An excellent document in PDF
+to Schematron] by Mulleberry technologies. An excellent document in PDF
 to get you started on Schematron.
 * http://www.schematron.com[Schematron official site]. This contains
 links to other resources
diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc b/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
index b73b14c..6d7403c 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
+++ b/components/camel-servicenow/camel-servicenow-component/src/main/docs/servicenow-component.adoc
@@ -370,7 +370,7 @@ NOTE: http://wiki.servicenow.com/index.php?title=REST_API#Available_APIs[Fuji RE
 NOTE: https://docs.servicenow.com/bundle/helsinki-servicenow-platform/page/integrate/inbound-rest/reference/r_RESTResources.html[Helsinki REST API Documentation]
 
 == Usage examples:
- 
+ 
 [source,java]
 .Retrieve 10 Incidents
 -------------------------------------------------------------------------------------------------------------------
@@ -384,7 +384,7 @@ context.addRoutes(new RouteBuilder() {
                + "&oauthClientSecret={{env:SERVICENOW_OAUTH2_CLIENT_SECRET}}"
            .to("mock:servicenow");
     }
-}); 
+}); 
 
 FluentProducerTemplate.on(context)
     .withHeader(ServiceNowConstants.RESOURCE, "table")
diff --git a/components/camel-slack/src/main/docs/slack-component.adoc b/components/camel-slack/src/main/docs/slack-component.adoc
index 054e794..8c48ed4 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -3,10 +3,10 @@
 
 *Available as of Camel version 2.16*
 
-The Slack component allows you to connect to an instance
-of http://www.slack.com/[Slack] and delivers a message contained in the
+The Slack component allows you to connect to an instance
+of http://www.slack.com/[Slack] and delivers a message contained in the
 message body via a pre
-established https://api.slack.com/incoming-webhooks[Slack incoming
+established https://api.slack.com/incoming-webhooks[Slack incoming
 webhook].
 
 Maven users will need to add the following dependency to their `pom.xml`
diff --git a/components/camel-smpp/src/main/docs/smpp-component.adoc b/components/camel-smpp/src/main/docs/smpp-component.adoc
index 9ed4800..1db417f 100644
--- a/components/camel-smpp/src/main/docs/smpp-component.adoc
+++ b/components/camel-smpp/src/main/docs/smpp-component.adoc
@@ -30,25 +30,25 @@ for this component:
 
 == SMS limitations
 
-SMS is neither reliable or secure.  Users who require reliable and
+SMS is neither reliable or secure.  Users who require reliable and
 secure delivery may want to consider using the XMPP or SIP components
 instead, combined with a smartphone app supporting the chosen protocol.
 
 * Reliability: although the SMPP standard offers a range of feedback
 mechanisms to indicate errors, non-delivery and confirmation of delivery
 it is not uncommon for mobile networks to hide or simulate these
-responses.  For example, some networks automatically send a delivery
+responses.  For example, some networks automatically send a delivery
 confirmation for every message even if the destination number is invalid
-or not switched on.  Some networks silently drop messages if they think
-they are spam.  Spam detection rules in the network may be very crude,
+or not switched on.  Some networks silently drop messages if they think
+they are spam.  Spam detection rules in the network may be very crude,
 sometimes more than 100 messages per day from a single sender may be
 considered spam.
 * Security: there is basic encryption for the last hop from the radio
-tower down to the recipient handset.  SMS messages are not encrypted or
-authenticated in any other part of the network.  Some operators allow
+tower down to the recipient handset.  SMS messages are not encrypted or
+authenticated in any other part of the network.  Some operators allow
 staff in retail outlets or call centres to browse through the SMS
-message histories of their customers.  Message sender identity can be
-easily forged.  Regulators and even the mobile telephone industry itself
+message histories of their customers.  Message sender identity can be
+easily forged.  Regulators and even the mobile telephone industry itself
 has cautioned against the use of SMS in two-factor authentication
 schemes and other purposes where security is important.
 
@@ -57,20 +57,20 @@ to the SMS network, it can not offer an easy solution to these problems.
 
 == Data coding, alphabet and international character sets
 
-Data coding and alphabet can be specified on a per-message basis. 
-Default values can be specified for the endpoint.  It is important to
+Data coding and alphabet can be specified on a per-message basis. 
+Default values can be specified for the endpoint.  It is important to
 understand the relationship between these options and the way the
 component acts when more than one value is set.
 
 Data coding is an 8 bit field in the SMPP wire format.
 
-Alphabet corresponds to bits 0-3 of the data coding field.  For some
+Alphabet corresponds to bits 0-3 of the data coding field.  For some
 types of message, where a message class is used (by setting bit 5 of the
 data coding field), the lower two bits of the data coding field are not
 interpreted as alphabet and only bits 2 and 3 impact the alphabet.
 
 Furthermore, current version of the JSMPP library only seems to support
-bits 2 and 3, assuming that bits 0 and 1 are used for message class. 
+bits 2 and 3, assuming that bits 0 and 1 are used for message class. 
 This is why the Alphabet class in JSMPP doesn't support the value 3
 (binary 0011) which indicates ISO-8859-1.
 
@@ -88,10 +88,10 @@ find:
 parameter)
 
 Older versions of Camel had bugs in support for international character
-sets.  This feature only worked when a single encoding was used for all
+sets.  This feature only worked when a single encoding was used for all
 messages and was troublesome when users wanted to change it on a
-per-message basis.  Users who require this to work should ensure their
-version of Camel includes the fix for 
+per-message basis.  Users who require this to work should ensure their
+version of Camel includes the fix for 
 
 JIRA Issues Macro: com.atlassian.sal.api.net.ResponseStatusException:
 Unexpected response received. Status code: 404
@@ -101,25 +101,25 @@ Unexpected response received. Status code: 404
 In addition to trying to send the data coding value to the SMSC, the
 Camel component also tries to analyze the message body, convert it to a
 Java String (Unicode) and convert that to a byte array in the
-corresponding alphabet  When deciding which alphabet to use in the byte
+corresponding alphabet  When deciding which alphabet to use in the byte
 array, the Camel SMPP component does not consider the data coding value
 (header or configuration), it only considers the specified alphabet
 (from either the header or endpoint parameter).
 
 If some characters in the String can't be represented in the chosen
-alphabet, they may be replaced by the question mark ( ? ) symbol.  Users
+alphabet, they may be replaced by the question mark ( ? ) symbol.  Users
 of the API may want to consider checking if their message body can be
 converted to ISO-8859-1 before passing it to the component and if not,
-setting the alphabet header to request UCS-2 encoding.  If the alphabet
+setting the alphabet header to request UCS-2 encoding.  If the alphabet
 and data coding options are not specified at all then the component may
 try to detect the required encoding and set the data coding for you.
 
 The list of alphabet codes are specified in the SMPP specification v3.4,
-section 5.2.19.  One notable limitation of the SMPP specification is
+section 5.2.19.  One notable limitation of the SMPP specification is
 that there is no alphabet code for explicitly requesting use of the GSM
-3.38 (7 bit) character set.  Choosing the value 0 for the alphabet
+3.38 (7 bit) character set.  Choosing the value 0 for the alphabet
 selects the SMSC _default_ alphabet, this usually means GSM 3.38 but it
-is not guaranteed.  The SMPP gateway Nexmo
+is not guaranteed.  The SMPP gateway Nexmo
 https://help.nexmo.com/hc/en-us/articles/204015813-How-to-change-the-character-encoding-in-SMPP-[actually
 allows the default to be mapped to any other character set with a
 control panel option]. It is suggested that users check with their SMSC
@@ -130,18 +130,18 @@ default.
 
 After transforming a message body from a String to a byte array, the
 Camel component is also responsible for splitting the message into parts
-(within the 140 byte SMS size limit) before passing it to JSMPP.  This
+(within the 140 byte SMS size limit) before passing it to JSMPP.  This
 is completed automatically.
 
 If the GSM 3.38 alphabet is used, the component will pack up to 160
-characters into the 140 byte message body.  If an 8 bit character set is
+characters into the 140 byte message body.  If an 8 bit character set is
 used (e.g. ISO-8859-1 for western Europe) then 140 characters will be
-allowed within the 140 byte message body.  If 16 bit UCS-2 encoding is
+allowed within the 140 byte message body.  If 16 bit UCS-2 encoding is
 used then just 70 characters fit into each 140 byte message.
 
-Some SMSC providers implement throttling rules.  Each part of a message
+Some SMSC providers implement throttling rules.  Each part of a message
 that has been split may be counted separately by the provider's
-throttling mechanism.  The Camel Throttler component can be useful for
+throttling mechanism.  The Camel Throttler component can be useful for
 throttling messages in the SMPP route before handing them to the SMSC.
 
 == URI format
@@ -410,16 +410,16 @@ converted in the following way: `String` -> `org.jsmpp.bean.OptionalParameter.CO
 `null` -> `org.jsmpp.bean.OptionalParameter.Null`
 
 |CamelSmppEncoding |String |*only for SubmitSm,
-SubmitMulti and DataSm*.  Specifies the encoding (character set name) of
-the bytes in the message body.  If the message body is a string then
-this is not relevant because Java Strings are always Unicode.  If the
+SubmitMulti and DataSm*.  Specifies the encoding (character set name) of
+the bytes in the message body.  If the message body is a string then
+this is not relevant because Java Strings are always Unicode.  If the
 body is a byte array then this header can be used to indicate that it is
-ISO-8859-1 or some other value.  Default value is specified by the
+ISO-8859-1 or some other value.  Default value is specified by the
 endpoint configuration parameter _encoding_
 
 |CamelSmppSplittingPolicy |String |*only for SubmitSm,
-SubmitMulti and DataSm*.  Specifies the policy for message splitting for
-this exchange.  Possible values are described in the endpoint
+SubmitMulti and DataSm*.  Specifies the policy for message splitting for
+this exchange.  Possible values are described in the endpoint
 configuration parameter _splittingPolicy_
 |=======================================================================
 
@@ -592,7 +592,7 @@ capabilities
 
 When an error occurs sending a message with SubmitSm (the default
 action), the org.apache.camel.component.smpp.SmppException is thrown
-with a nested exception, org.jsmpp.extra.NegativeResponseException. 
+with a nested exception, org.jsmpp.extra.NegativeResponseException. 
 Call NegativeResponseException.getCommandStatus() to obtain the exact
 SMPP negative response code, the values are explained in the SMPP
 specification 3.4, section 5.1.3. +
diff --git a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
index 8e14f18..acbb814 100644
--- a/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
+++ b/components/camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc
@@ -3,13 +3,13 @@
 
 *Available as of Camel version 2.17*
 
-YAML is a Data Format to marshal and unmarshal
-Java objects to and from http://www.yaml.org/[YAML].
+YAML is a Data Format to marshal and unmarshal
+Java objects to and from http://www.yaml.org/[YAML].
 
 For YAML to object marshalling, Camel provides integration with three
 popular YAML libraries:
 
-* The http://www.snakeyaml.org/[SnakeYAML] library
+* The http://www.snakeyaml.org/[SnakeYAML] library
 
 Every library requires adding the special camel component (see
 "Dependency..." paragraphs further down). By default Camel uses the
@@ -111,8 +111,8 @@ from("activemq:My.Queue")
 
 == Using YAML in Spring DSL
 
-When using Data Format in Spring DSL you need to
-declare the data formats first. This is done in the *DataFormats* XML
+When using Data Format in Spring DSL you need to
+declare the data formats first. This is done in the *DataFormats* XML
 tag.
 
 [source,xml]
@@ -164,11 +164,11 @@ And then you can refer to those ids in the route:
 == Dependencies for SnakeYAML
 
 To use YAML in your camel routes you need to add the a dependency
-on *camel-snakeyaml* which implements this data format.
+on *camel-snakeyaml* which implements this data format.
 
 If you use maven you could just add the following to your pom.xml,
 substituting the version number for the latest & greatest release
-(see the download page for the latest versions).
+(see the download page for the latest versions).
 
 [source,xml]
 ------------------------------------------
@@ -179,6 +179,6 @@ substituting the version number for the latest & greatest release
 </dependency>
 ------------------------------------------
 
- 
+ 
 
- 
+ 
diff --git a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
index 406339f..18a2b0c 100644
--- a/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
+++ b/components/camel-spark-rest/src/main/docs/spark-rest-component.adoc
@@ -128,7 +128,7 @@ from("spark-rest:get:hello/:me")
 == Mapping to Camel Message
 
 The Spark Request object is mapped to a Camel Message as
-a `org.apache.camel.component.sparkrest.SparkMessage` which has access
+a `org.apache.camel.component.sparkrest.SparkMessage` which has access
 to the raw Spark request using the getRequest method. By default the
 Spark body is mapped to Camel message body, and any HTTP headers / Spark
 parameters is mapped to Camel Message headers. There is special support
@@ -136,7 +136,7 @@ for the Spark splat syntax, which is mapped to the Camel message header
 with key splat.
 
 For example the given route below uses Spark splat (the asterisk
-sign) in the context path which we can access as a header form the
+sign) in the context path which we can access as a header form the
 Simple language to construct a response message.
 
 [source,java]
@@ -177,7 +177,7 @@ return new RouteBuilder() {
 </camelContext>
 --------------------------------------------------------------
 
-See more details at the Rest DSL.
+See more details at the Rest DSL.
 
 == More examples
 
diff --git a/components/camel-spark/src/main/docs/spark-component.adoc b/components/camel-spark/src/main/docs/spark-component.adoc
index d06e646..62a3ce7 100644
--- a/components/camel-spark/src/main/docs/spark-component.adoc
+++ b/components/camel-spark/src/main/docs/spark-component.adoc
@@ -24,8 +24,8 @@ cluster.
 image:camel_spark_cluster.png[image]
 
 While Spark component is primary designed to work as a _long running
-job_ serving as an bridge between Spark cluster and the other endpoints,
-you can also use it as a _fire-once_ short job.   
+job_ serving as an bridge between Spark cluster and the other endpoints,
+you can also use it as a _fire-once_ short job.   
 
 == Running Spark in OSGi servers
 
@@ -136,8 +136,8 @@ The component supports 5 options, which are listed below.
 // spring-boot-auto-configure options: END
 
 
- 
-== RDD jobs 
+ 
+== RDD jobs 
 
 To invoke an RDD job, use the following URI:
 
@@ -148,10 +148,10 @@ To invoke an RDD job, use the following URI:
 spark:rdd?rdd=#testFileRdd&rddCallback=#transformation
 ------------------------------------------------------
 
- Where `rdd` option refers to the name of an RDD instance (subclass of
+ Where `rdd` option refers to the name of an RDD instance (subclass of
 `org.apache.spark.api.java.JavaRDDLike`) from a Camel registry, while
 `rddCallback` refers to the implementation
-of `org.apache.camel.component.spark.RddCallback` interface (also from a
+of `org.apache.camel.component.spark.RddCallback` interface (also from a
 registry). RDD callback provides a single method used to apply incoming
 messages against the given RDD. Results of callback computations are
 saved as a body to an exchange.
@@ -209,7 +209,7 @@ JavaRDDLike myRdd(JavaSparkContext sparkContext) {
 === Void RDD callbacks
 
 If your RDD callback doesn't return any value back to a Camel pipeline,
-you can either return `null` value or use `VoidRddCallback` base class:
+you can either return `null` value or use `VoidRddCallback` base class:
 
 *Spark RDD definition*
 
@@ -229,7 +229,7 @@ RddCallback<Void> rddCallback() {
 === Converting RDD callbacks
 
 If you know what type of the input data will be sent to the RDD
-callback, you can use `ConvertingRddCallback` and let Camel to
+callback, you can use `ConvertingRddCallback` and let Camel to
 automatically convert incoming messages before inserting those into the
 callback:
 
@@ -252,30 +252,30 @@ RddCallback<Long> rddCallback(CamelContext context) {
 === Annotated RDD callbacks
 
 Probably the easiest way to work with the RDD callbacks is to provide
-class with method marked with `@RddCallback` annotation:
+class with method marked with `@RddCallback` annotation:
 
 *Annotated RDD callback definition*
 
 [source,java]
 -----------------------------------------------------------------------------------------------------
 import static org.apache.camel.component.spark.annotations.AnnotatedRddCallback.annotatedRddCallback;
- 
+ 
 @Bean
 RddCallback<Long> rddCallback() {
     return annotatedRddCallback(new MyTransformation());
 }
- 
+ 
 ...
- 
+ 
 import org.apache.camel.component.spark.annotation.RddCallback;
- 
+ 
 public class MyTransformation {
- 
+ 
     @RddCallback
     long countLines(JavaRDD<String> textFile, int first, int second) {
         return textFile.count() * first * second;
     }
- 
+ 
 }
 -----------------------------------------------------------------------------------------------------
 
@@ -288,38 +288,38 @@ to match the parameters of the annotated method:
 [source,java]
 ------------------------------------------------------------------------------------------------------------------------------
 import static org.apache.camel.component.spark.annotations.AnnotatedRddCallback.annotatedRddCallback;
- 
+ 
 @Bean
 RddCallback<Long> rddCallback(CamelContext camelContext) {
     return annotatedRddCallback(new MyTransformation(), camelContext);
 }
- 
+ 
 ...
 
- 
+ 
 import org.apache.camel.component.spark.annotation.RddCallback;
- 
+ 
 public class MyTransformation {
- 
+ 
     @RddCallback
     long countLines(JavaRDD<String> textFile, int first, int second) {
         return textFile.count() * first * second;
     }
- 
+ 
 }
- 
+ 
 ...
- 
+ 
 // Convert String "10" to integer
 long result = producerTemplate.requestBody("spark:rdd?rdd=#rdd&rddCallback=#rddCallback" Arrays.asList(10, "10"), long.class);
 ------------------------------------------------------------------------------------------------------------------------------
 
- 
+ 
 
 == DataFrame jobs
 
 Instead of working with RDDs Spark component can work with DataFrames as
-well. 
+well. 
 
 To invoke an DataFrame job, use the following URI:
 
@@ -330,10 +330,10 @@ To invoke an DataFrame job, use the following URI:
 spark:dataframe?dataFrame=#testDataFrame&dataFrameCallback=#transformation
 --------------------------------------------------------------------------
 
- Where `dataFrame` option refers to the name of an DataFrame instance
+ Where `dataFrame` option refers to the name of an DataFrame instance
 (`instances of org.apache.spark.sql.Dataset and org.apache.spark.sql.Row`) from a Camel registry,
-while `dataFrameCallback` refers to the implementation
-of `org.apache.camel.component.spark.DataFrameCallback` interface (also
+while `dataFrameCallback` refers to the implementation
+of `org.apache.camel.component.spark.DataFrameCallback` interface (also
 from a registry). DataFrame callback provides a single method used to
 apply incoming messages against the given DataFrame. Results of callback
 computations are saved as a body to an exchange.
@@ -393,8 +393,8 @@ Dataset<Row> cars(HiveContext hiveContext) {
 
 == Hive jobs
 
- Instead of working with RDDs or DataFrame Spark component can also
-receive Hive SQL queries as payloads. To send Hive query to Spark
+ Instead of working with RDDs or DataFrame Spark component can also
+receive Hive SQL queries as payloads. To send Hive query to Spark
 component, use the following URI:
 
 *Spark RDD producer*
diff --git a/components/camel-splunk/src/main/docs/splunk-component.adoc b/components/camel-splunk/src/main/docs/splunk-component.adoc
index c5ff212..b0099dd 100644
--- a/components/camel-splunk/src/main/docs/splunk-component.adoc
+++ b/components/camel-splunk/src/main/docs/splunk-component.adoc
@@ -46,7 +46,7 @@ in Splunk.
 |=======================================================================
 
 When publishing events the message body should contain a
-SplunkEvent.  See comment under message body.
+SplunkEvent.  See comment under message body.
 
 *Example*
 
@@ -215,7 +215,7 @@ result for the consumer.
 
 You can send raw data to Splunk by setting the raw
 option on the producer endpoint. This is useful for eg. json/xml and
-other payloads where Splunk has build in support. 
+other payloads where Splunk has build in support. 
 
 == Use Cases
 
diff --git a/components/camel-spring-boot/src/main/docs/spring-boot.adoc b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
index ddbd8df..155da7f 100644
--- a/components/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/components/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -3,9 +3,9 @@
 
 *Available as of Camel 2.15*
 
-Spring Boot component provides auto-configuration for Apache Camel. Our
+Spring Boot component provides auto-configuration for Apache Camel. Our
 opinionated auto-configuration of the Camel context auto-detects Camel
-routes available in the Spring context and registers the key Camel
+routes available in the Spring context and registers the key Camel
 utilities (like producer template, consumer template and the type
 converter) as beans.
 
@@ -21,7 +21,7 @@ in order to use this component:
 </dependency>
 ----
 
-`camel-spring-boot` jar comes with the `spring.factories` file, so as
+`camel-spring-boot` jar comes with the `spring.factories` file, so as
 soon as you add that dependency into your classpath, Spring Boot will
 automatically auto-configure Camel for you.
 
@@ -31,11 +31,11 @@ automatically auto-configure Camel for you.
 *Available as of Camel 2.17*
 
 Apache Camel ships
-a https://github.com/spring-projects/spring-boot/tree/master/spring-boot-project/spring-boot-starters[Spring
+a https://github.com/spring-projects/spring-boot/tree/master/spring-boot-project/spring-boot-starters[Spring
 Boot Starter] module that allows you to develop Spring Boot applications
 using starters. There is a
 https://github.com/apache/camel/tree/master/examples/camel-example-spring-boot[sample
-application] in the source code also.
+application] in the source code also.
 
 To use the starter, add the following to your spring boot pom.xml file:
 
@@ -69,8 +69,8 @@ public class MyRoute extends RouteBuilder {
 
 Then these routes will be started automatically.
 
-You can customize the Camel application in the `application.properties`
-or `application.yml` file. 
+You can customize the Camel application in the `application.properties`
+or `application.yml` file. 
 
 
 // spring-boot-auto-configure options: START
@@ -231,11 +231,11 @@ The component supports 127 options, which are listed below.
 
 The most important piece of functionality provided by the Camel
 auto-configuration is `CamelContext` instance.
-Camel auto-configuration creates a `SpringCamelContext` for you and
+Camel auto-configuration creates a `SpringCamelContext` for you and
 takes care of the proper initialization and shutdown of that context.
-The created Camel context is also registered in the Spring application
-context (under `camelContext` bean name), so you can access it just as
- any other Spring bean.
+The created Camel context is also registered in the Spring application
+context (under `camelContext` bean name), so you can access it just as
+ any other Spring bean.
 
 [source,java]
 ----
@@ -257,9 +257,9 @@ public class MyAppConfig {
 == Auto-detecting Camel routes
 
 Camel auto-configuration collects all the `RouteBuilder` instances from
-the Spring context and automatically injects them into the provided
+the Spring context and automatically injects them into the provided
 `CamelContext`. That means that creating new Camel route with the Spring
-Boot starter is as simple as adding the `@Component` annotated class to
+Boot starter is as simple as adding the `@Component` annotated class to
 your classpath:
 
 [source,java]
@@ -275,7 +275,7 @@ public class MyRouter extends RouteBuilder {
 }
 ----
 
-Or creating a new route `RouteBuilder` bean in your `@Configuration` class:
+Or creating a new route `RouteBuilder` bean in your `@Configuration` class:
 
 [source,java]
 ----
@@ -301,11 +301,11 @@ public class MyRouterConfiguration {
 == Camel properties
 
 Spring Boot auto-configuration automatically connects
-to http://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config[Spring
-Boot external configuration] (like properties placeholders, OS
+to http://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config[Spring
+Boot external configuration] (like properties placeholders, OS
 environment variables or system properties) with
-the Camel properties support. It basically means
-that any property defined in `application.properties` file:  
+the Camel properties support. It basically means
+that any property defined in `application.properties` file:  
 
 [source,text]
 ----
@@ -337,9 +337,9 @@ public class MyRouter extends RouteBuilder {
 [[SpringBoot-CustomCamelcontextconfiguration]]
 == Custom Camel context configuration
 
-If you would like to perform some operations on `CamelContext` bean
+If you would like to perform some operations on `CamelContext` bean
 created by Camel auto-configuration,
-register `CamelContextConfiguration` instance in your Spring context:
+register `CamelContextConfiguration` instance in your Spring context:
 
 [source,java]
 ----
@@ -359,17 +359,17 @@ public class MyAppConfig {
 }
 ----
 
-Method beforeApplicationStart` will
+Method beforeApplicationStart` will
 be called just before the Spring context is started, so the
 `CamelContext` instance passed to this callback is
-fully auto-configured. You can add many instances of
-`CamelContextConfiguration` into your Spring context - all of them will
+fully auto-configured. You can add many instances of
+`CamelContextConfiguration` into your Spring context - all of them will
 be executed.
 
 [[SpringBoot-DisablingJMX]]
 == Disabling JMX
 
-To disable JMX of the auto-configured `CamelContext` use
+To disable JMX of the auto-configured `CamelContext` use
 `camel.springboot.jmxEnabled` property (JMX is enabled by default). For
 example you could add the following property to your
 `application.properties` file:
@@ -417,10 +417,10 @@ camel.springboot.producer-template-cache-size = 200
 ----
 
 [[SpringBoot-Auto-configuredTypeConverter]]
-== Auto-configured TypeConverter
+== Auto-configured TypeConverter
 
-Camel auto-configuration registers a `TypeConverter` instance named
-`typeConverter` in the Spring context.
+Camel auto-configuration registers a `TypeConverter` instance named
+`typeConverter` in the Spring context.
 
 [source,java]
 ----
@@ -442,14 +442,14 @@ public class InvoiceProcessor {
 === Spring type conversion API bridge
 
 Spring comes with
-the powerful http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert[type
+the powerful http://docs.spring.io/spring/docs/current/spring-framework-reference/html/validation.html#core-convert[type
 conversion API]. Spring API happens to be very similar to the Camel
 type converter API. As those APIs are so
 similar, Camel Spring Boot automatically registers a bridge converter
 (`SpringTypeConverter`) that delegates to the Spring conversion API.That
 means that out-of-the-box Camel will treat Spring Converters like Camel
 ones. With this approach you can enjoy both Camel and Spring converters
-accessed via Camel `TypeConverter` API:
+accessed via Camel `TypeConverter` API:
 
 [source,java]
 ----
@@ -468,7 +468,7 @@ public class InvoiceProcessor {
 ----
 
 Under the hood Camel Spring Boot delegates conversion to the Spring's
-`ConversionService` instances available in the application context. If
+`ConversionService` instances available in the application context. If
 no `ConversionService` instance is available, Camel Spring Boot
 auto-configuration will create one for you.
 
@@ -477,7 +477,7 @@ auto-configuration will create one for you.
 
 If you don't want Camel Spring Boot to register type-conversions related
 features (like `TypeConverter` instance or Spring bridge) set the
-`camel.springboot.type-conversion` property to `false`.
+`camel.springboot.type-conversion` property to `false`.
 
 [source,text]
 ----
@@ -488,7 +488,7 @@ camel.springboot.type-conversion = false
 [[SpringBoot-Keepingapplicationalive]]
 == Keeping the application alive
 
-Camel applications having this feature enabled launch a new thread on startup for the sole purpose of
+Camel applications having this feature enabled launch a new thread on startup for the sole purpose of
 keeping the application alive by preventing JVM termination.
 It means that after you start a Camel application with Spring Boot, your
 application waits for a Ctrl+C signal and does not exit immediately.
diff --git a/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
index 5528653..d8e4e75 100644
--- a/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
+++ b/components/camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc
@@ -16,7 +16,7 @@ Maven users will need to add the following dependency to their `pom.xml` in orde
 </dependency>
 ----
 
-`camel-spring-cloud-netflix` jar comes with the `spring.factories` file, so as soon as you add that dependency into your classpath, Spring Boot will automatically auto-configure Camel for you.
+`camel-spring-cloud-netflix` jar comes with the `spring.factories` file, so as soon as you add that dependency into your classpath, Spring Boot will automatically auto-configure Camel for you.
 
 You can disable Camel Spring Cloud Netflix with the following properties:
 
diff --git a/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc b/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc
index 200fbdc..c9044e4 100644
--- a/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc
+++ b/components/camel-spring-cloud/src/main/docs/spring-cloud.adoc
@@ -17,7 +17,7 @@ in order to use this component:
 </dependency>
 ------------------------------------------------------------------------------------------------
 
-`camel-spring-cloud` jar comes with the `spring.factories` file, so as
+`camel-spring-cloud` jar comes with the `spring.factories` file, so as
 soon as you add that dependency into your classpath, Spring Boot will
 automatically auto-configure Camel for you.
 
diff --git a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc
index 99519cd..5af619e 100644
--- a/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc
+++ b/components/camel-spring-redis/src/main/docs/spring-redis-component.adoc
@@ -118,7 +118,7 @@ The component supports 3 options, which are listed below.
 == Usage
 
 See also the unit tests available
-at https://github.com/apache/camel/tree/master/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis[https://github.com/apache/camel/tree/master/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis].
+at https://github.com/apache/camel/tree/master/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis[https://github.com/apache/camel/tree/master/components/camel-spring-redis/src/test/java/org/apache/camel/component/redis].
 
 === Message headers evaluated by the Redis producer
 
diff --git a/components/camel-spring/src/main/docs/spring.adoc b/components/camel-spring/src/main/docs/spring.adoc
index 35e7d44..617cda4 100644
--- a/components/camel-spring/src/main/docs/spring.adoc
+++ b/components/camel-spring/src/main/docs/spring.adoc
@@ -23,7 +23,7 @@ framework to simplify your unit and integration testing using
 xref:manual::enterprise-integration-patterns.adoc[Enterprise Integration
 Patterns] and Camel's powerful xref:mock-component.adoc[Mock] and
 xref:test.adoc[Test] endpoints
-Camel supports Spring Boot using the `camel-spring-boot` component.
+Camel supports Spring Boot using the `camel-spring-boot` component.
 
 == Using Spring to configure the CamelContext
 
@@ -352,7 +352,7 @@ Integration] for further injections.
 
 To avoid a hung route when testing using Spring Transactions see the
 note about Spring Integration Testing
-under Transactional Client.
+under Transactional Client.
 
 == See also
 
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc b/components/camel-sql/src/main/docs/sql-component.adoc
index 9bd2788..f41f87f 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -95,7 +95,7 @@ order by
 ----
 
 In the file you can use multilines and format the SQL as you wish. And
-also use comments such as the – dash line.
+also use comments such as the – dash line.
 
 You can append query options to the URI in the following format,
 `?option=value&option=value&...`
@@ -248,10 +248,10 @@ message body changes slightly – instead of an iterator of parameters,
 the component expects an iterator that contains the parameter iterators;
 the size of the outer iterator determines the batch size.
 
-You can use the option useMessageBodyForSql that
+You can use the option useMessageBodyForSql that
 allows to use the message body as the SQL statement, and then the SQL
 parameters must be provided in a header with the
-key SqlConstants.SQL_PARAMETERS. This allows the SQL component to work
+key SqlConstants.SQL_PARAMETERS. This allows the SQL component to work
 more dynamic as the SQL query is from the message body.
 
 == Result of the query
@@ -262,11 +262,11 @@ http://static.springframework.org/spring/docs/2.5.x/api/org/springframework/jdbc
 method. For `update` operations, the result is the number of updated
 rows, returned as an `Integer`.
 
-By default, the result is placed in the message body.  If the
-outputHeader parameter is set, the result is placed in the header.  This
+By default, the result is placed in the message body.  If the
+outputHeader parameter is set, the result is placed in the header.  This
 is an alternative to using a full message enrichment pattern to add
 headers, it provides a concise syntax for querying a sequence or some
-other small value into a header.  It is convenient to use outputHeader
+other small value into a header.  It is convenient to use outputHeader
 and outputType together:
 
 [source,java]
@@ -281,7 +281,7 @@ from("jms:order.inbox")
 The producer supports outputType=StreamList
 that uses an iterator to stream the output of the query. This allows to
 process the data in a streaming fashion which for example can be used by
-the Splitter EIP to process each row one at a time,
+the Splitter EIP to process each row one at a time,
 and load data from the database as needed.
 
 [source,java]
@@ -294,7 +294,7 @@ from("direct:withSplitModel")
             .to("mock:result")
         .end();
 ----
- 
+ 
 
 == Header values
 
@@ -306,11 +306,11 @@ count in the following message headers:
 |Header |Description
 
 |`CamelSqlUpdateCount` |The number of rows updated for `update` operations, returned as an
-`Integer` object. This header is not provided when using
+`Integer` object. This header is not provided when using
 outputType=StreamList.
 
 |`CamelSqlRowCount` |The number of rows returned for `select` operations, returned as an
-`Integer` object. This header is not provided when using
+`Integer` object. This header is not provided when using
 outputType=StreamList.
 
 |`CamelSqlQuery` |Query to execute. This query takes precedence over the
@@ -318,7 +318,7 @@ query specified in the endpoint URI. Note that query parameters in the
 header _are_ represented by a `?` instead of a `pass:[#]` symbol
 |===
 
-When performing `insert` operations, the SQL Component stores the rows
+When performing `insert` operations, the SQL Component stores the rows
 with the generated keys and number of these rown in the following
 message headers:
 
@@ -441,8 +441,8 @@ the message body or a header etc.
 
 To use IN you need to:
 
-* prefix the parameter name with `in:`
-* add `( )` around the parameter
+* prefix the parameter name with `in:`
+* add `( )` around the parameter
 
 An example explains this better. The following query is used:
 
@@ -495,7 +495,7 @@ from("direct:query")
     .to("log:query")
     .to("mock:query");
 ----
- 
+ 
 
 == Using the JDBC based idempotent repository
 
@@ -521,7 +521,7 @@ idempotent repository. We use the following schema:
 CREATE TABLE CAMEL_MESSAGEPROCESSED ( processorName VARCHAR(255),
 messageId VARCHAR(100) )
 ----
- 
+ 
 
 We added the createdAt column:
 
@@ -531,7 +531,7 @@ CREATE TABLE CAMEL_MESSAGEPROCESSED ( processorName VARCHAR(255),
 messageId VARCHAR(100), createdAt TIMESTAMP )
 ----
 
-WARNING: The SQL Server *TIMESTAMP* type is a fixed-length binary-string type. It
+WARNING: The SQL Server *TIMESTAMP* type is a fixed-length binary-string type. It
 does not map to any of the JDBC time types: *DATE*, *TIME*, or
 *TIMESTAMP*.
 
@@ -664,7 +664,7 @@ CREATE TABLE aggregationRepo3_completed (
  constraint aggregationRepo3_completed_pk PRIMARY KEY (id)
 );
 ----
- 
+ 
 And then configure the repository to enable this behavior as shown
 below:
 
diff --git a/components/camel-sql/src/main/docs/sql-stored-component.adoc b/components/camel-sql/src/main/docs/sql-stored-component.adoc
index 9def8ed..a02932a 100644
--- a/components/camel-sql/src/main/docs/sql-stored-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-stored-component.adoc
@@ -5,7 +5,7 @@
 
 The SQL Stored component allows you to work with databases using JDBC
 Stored Procedure queries. This component is an extension to
-the xref:sql-component.adoc[SQL Component] but specialized for calling
+the xref:sql-component.adoc[SQL Component] but specialized for calling
 stored procedures.
 
 This component uses `spring-jdbc` behind the scenes for the actual SQL
@@ -34,7 +34,7 @@ sql-stored:template[?options]
 ----
 
 Where template is the stored procedure template, where you declare the
-name of the stored procedure and the IN, INOUT, and OUT arguments. 
+name of the stored procedure and the IN, INOUT, and OUT arguments. 
 
 You can also refer to the template in a external file on the file system
 or classpath such as:
diff --git a/components/camel-swagger-java/src/main/docs/swagger-java.adoc b/components/camel-swagger-java/src/main/docs/swagger-java.adoc
index ee9a29c..72ad366 100644
--- a/components/camel-swagger-java/src/main/docs/swagger-java.adoc
+++ b/components/camel-swagger-java/src/main/docs/swagger-java.adoc
@@ -2,12 +2,12 @@
 
 *Available as of Camel 2.16*
 
-The  Rest DSL can be integrated with
-the `camel-swagger-java` module which is used for exposing the REST
+The  Rest DSL can be integrated with
+the `camel-swagger-java` module which is used for exposing the REST
 services and their APIs using http://swagger.io/[Swagger].
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ----
@@ -25,7 +25,7 @@ the REST components (without the need for servlet)
 == Using Swagger in rest-dsl
 
 You can enable the swagger api from the rest-dsl by configuring the
-`apiContextPath` dsl as shown below:
+`apiContextPath` dsl as shown below:
 
 [source,java]
 ----
@@ -59,15 +59,15 @@ public class UserRouteBuilder extends RouteBuilder {
     }
 }
 ----
- 
+ 
 
 == Options
 
 The swagger module can be configured using the following options. To
 configure using a servlet you use the init-param as shown above. When
 configuring directly in the rest-dsl, you use the appropriate method,
-such as `enableCORS`, `host,contextPath`, dsl. The options
-with `api.xxx` is configured using `apiProperty` dsl.
+such as `enableCORS`, `host,contextPath`, dsl. The options
+with `api.xxx` is configured using `apiProperty` dsl.
 
 [width="100%",cols="10%,10%,80%",options="header",]
 |===
@@ -174,7 +174,7 @@ CamelContexts in the same JVM. These contexts are listed in the root
 path, eg `/api-docs` as a simple list of names in json format. To access
 the swagger documentation then the context-path must be appended with
 the Camel context id, such as `api-docs/myCamel`. The
-option apiContextIdPattern can be used to filter the names in this list.
+option apiContextIdPattern can be used to filter the names in this list.
 
 == JSon or Yaml
 
@@ -190,5 +190,5 @@ json is returned as the default format.
 == Examples
 
 In the Apache Camel distribution we ship
-the `camel-example-swagger-cdi` and `camel-example-swagger-java` which
+the `camel-example-swagger-cdi` and `camel-example-swagger-java` which
 demonstrates using this Swagger component.
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index c54d06a..7ff1f52 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -4,7 +4,7 @@
 *Available as of Camel version 2.6*
 
 The Syslog dataformat is used for working with
-http://www.ietf.org/rfc/rfc3164.txt[RFC3164] and RFC5424 messages.
+http://www.ietf.org/rfc/rfc3164.txt[RFC3164] and RFC5424 messages.
 
 This component supports the following:
 
@@ -16,7 +16,7 @@ String
 * Integration with the xref:mina-component.adoc[camel-mina] component.
 * Integration with the xref:netty-component.adoc[camel-netty] component.
 * Encoder and decoder for
-the xref:netty-component.adoc[Netty Component] component.
+the xref:netty-component.adoc[Netty Component] component.
 * Support for RFC5424 also.
 
 Maven users will need to add the following dependency to their `pom.xml`
@@ -41,7 +41,7 @@ The UDP port that has been assigned to syslog is 514.
 To expose a Syslog listener service we reuse the existing
 xref:mina-component.adoc[Mina Component] component or xref:netty-component.adoc[Netty Component]
 where we just use the `Rfc3164SyslogDataFormat` to marshal and unmarshal
-messages. Notice that from *Camel 2.14* onwards the syslog dataformat is
+messages. Notice that from *Camel 2.14* onwards the syslog dataformat is
 renamed to `SyslogDataFormat`.
 
 == Options
@@ -91,9 +91,9 @@ ND
 *Available as of Camel 2.14*
 
 To expose a Syslog listener service we reuse the
-existing xref:mina-component.adoc[Mina Component] component
-or xref:netty-component.adoc[Netty Component] where we just use
-the `SyslogDataFormat` to marshal and unmarshal messages
+existing xref:mina-component.adoc[Mina Component] component
+or xref:netty-component.adoc[Netty Component] where we just use
+the `SyslogDataFormat` to marshal and unmarshal messages
 
 === Exposing a Syslog listener
 
diff --git a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
index 7b9b182..c3af1c7 100644
--- a/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
+++ b/components/camel-tarfile/src/main/docs/tarfile-dataformat.adoc
@@ -109,7 +109,7 @@ the `UnTarpedMessageProcessor`.
 
 [source,java]
 -----------------------------------------------------------------------------------------------
-from("activemq:queue:MY_QUEUE").unmarshal().tarFile().process(new UnTarpedMessageProcessor()); 
+from("activemq:queue:MY_QUEUE").unmarshal().tarFile().process(new UnTarpedMessageProcessor()); 
 -----------------------------------------------------------------------------------------------
 
 If the Tar File has more then one entry, the usingIterator option of
@@ -147,7 +147,7 @@ NOTE: Please note that this aggregation strategy requires eager completion
 check to work properly.
 
 In this example we aggregate all text files found in the input directory
-into a single Tar File that is stored in the output directory. 
+into a single Tar File that is stored in the output directory. 
 
 [source,java]
 -------------------------------------------------
@@ -159,10 +159,10 @@ into a single Tar File that is stored in the output directory. 
    .to("file:output/directory");
 -------------------------------------------------
 
-The outgoing `CamelFileName` message header is created using
-java.io.File.createTempFile, with the ".tar" suffix. If you want to
+The outgoing `CamelFileName` message header is created using
+java.io.File.createTempFile, with the ".tar" suffix. If you want to
 override this behavior, then you can set the value of
-the `CamelFileName` header explicitly in your route:
+the `CamelFileName` header explicitly in your route:
 
 [source,java]
 ------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc b/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
index b2a4b53..1b3b800 100644
--- a/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
+++ b/components/camel-test-blueprint/src/main/docs/test-blueprint.adoc
@@ -11,7 +11,7 @@ integration work. Camel supports the definition of
 Blueprint routes, but given
 that Blueprint is an OSGi specific technology, writing unit tests is
 quite difficult. This library leverages
-http://code.google.com/p/pojosr/[PojoSR] (now Felix Connect) which
+http://code.google.com/p/pojosr/[PojoSR] (now Felix Connect) which
 provides a service registry without using a fully compliant OSGi
 container. This allows defining real unit tests (as opposed to
 integration tests using
@@ -49,7 +49,7 @@ OSGi bundles available there. All the bundles with Blueprint descriptor
 files will be automatically started by the test container. If you would
 like to prevent particular bundles from being started by the test
 container, override the `getBundleFilter` method, just as demonstrated
-in the snippet below. 
+in the snippet below. 
 
 [source,java]
 --------------------------------------------------------------------------------
@@ -148,11 +148,11 @@ And in the route we use the FQN name:
     </route>
 ----------------------------------------------------------------
 
- 
+ 
 
-From *Camel 2.16.0*, an additional `addServicesOnStartup` method is
+From *Camel 2.16.0*, an additional `addServicesOnStartup` method is
 available to be overridden making it ideal for when needing to specify
-multiple services with the same interface. 
+multiple services with the same interface. 
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------------
@@ -160,10 +160,10 @@ multiple services with the same interface. 
   protected void addServicesOnStartup(List<KeyValueHolder<String, KeyValueHolder<Object, Dictionary>>> services) {
       Dictionary<String, String> dict1 = new Hashtable<String, String>();
       dict1.put("osgi.jndi.service.name", "jdbc/db1");
-        
+        
       Dictionary<String, String> dict2 = new Hashtable<String, String>();
       dict2.put("osgi.jndi.service.name", "jdbc/db2");
-        
+        
       services.add(asKeyValueService(javax.sql.DataSource.class.getName(), mockService1, dict1));
       services.add(asKeyValueService(javax.sql.DataSource.class.getName(), mockService2, dict2));
     }
@@ -171,5 +171,5 @@ multiple services with the same interface. 
 
 The `asKeyValueService` builder method can be used to construct the
 necessary parameters to create the service. The method takes in the name
-of the registered service, the object, and and a `Dictionary` as
+of the registered service, the object, and and a `Dictionary` as
 arguments.
diff --git a/components/camel-timer/src/main/docs/timer-component.adoc b/components/camel-timer/src/main/docs/timer-component.adoc
index e83b32c..8b12c32 100644
--- a/components/camel-timer/src/main/docs/timer-component.adoc
+++ b/components/camel-timer/src/main/docs/timer-component.adoc
@@ -186,7 +186,7 @@ negative delay to stop firing messages after a fixed number has been
 reached.
 
 If you don't specify a repeatCount then the timer will continue firing
-messages until the route will be stopped. 
+messages until the route will be stopped. 
 
 == Firing only once
 
diff --git a/components/camel-twilio/src/main/docs/twilio-component.adoc b/components/camel-twilio/src/main/docs/twilio-component.adoc
index 6857c97..52bc4b2 100644
--- a/components/camel-twilio/src/main/docs/twilio-component.adoc
+++ b/components/camel-twilio/src/main/docs/twilio-component.adoc
@@ -186,9 +186,9 @@ all of the endpoints. The endpoint URI MUST contain a prefix.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelTwilio.<option>`*. Note that the *`inBody`* option
-overrides message header, i.e. the endpoint option *`inBody=option`*
-would override a *`CamelTwilio.option`* header.
+the format *`CamelTwilio.<option>`*. Note that the *`inBody`* option
+overrides message header, i.e. the endpoint option *`inBody=option`*
+would override a *`CamelTwilio.option`* header.
 
 Endpoint can be one of:
 
@@ -226,7 +226,7 @@ to respond with https://www.twilio.com/docs/api/twiml[TwiML].
 
 == Message header
 
-Any of the options can be provided in a message header for producer
+Any of the options can be provided in a message header for producer
 endpoints with *CamelTwilio.* prefix.
 
 
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc
index f50fd68..c4ec2d9 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -155,7 +155,7 @@ The component supports 11 options, which are listed below.
 == Message Headers
 
 Camel uses the same message headers as the xref:http-component.adoc[HTTP]
-component. It also uses `Exchange.HTTP_CHUNKED,CamelHttpChunked` header to turn on or turn off
+component. It also uses `Exchange.HTTP_CHUNKED,CamelHttpChunked` header to turn on or turn off
 the chunked encoding on the camel-undertow consumer.
 
 Camel also populates *all* request.parameter and request.headers. For
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
index f83a553..2c102a2 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-csv-dataformat.adoc
@@ -3,8 +3,8 @@
 
 *Available as of Camel version 2.15*
 
-This xref:manual::data-format.adoc[Data
-Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
+This xref:manual::data-format.adoc[Data
+Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
 * CSV (Comma Separated Values), where the values are separated by a
@@ -171,18 +171,18 @@ Any other body will throws an exception.
 
 == Unmarshalling usages
 
-The unmarshalling uses an `InputStream` in order to read the data.
+The unmarshalling uses an `InputStream` in order to read the data.
 
 Each row produces either:
 
-* a list with all the values in it (`asMap` option with `false`);
+* a list with all the values in it (`asMap` option with `false`);
 * A map with all the values indexed by the
-headers (`asMap` option with `true`).
+headers (`asMap` option with `true`).
 
 All the rows can either:
 
-* be collected at once into a list (`lazyLoad` option with `false`);
-* be read on the fly using an iterator (`lazyLoad` option with `true`).
+* be collected at once into a list (`lazyLoad` option with `false`);
+* be read on the fly using an iterator (`lazyLoad` option with `true`).
 
 === Usage example: unmarshalling a CSV format into maps with automatic headers
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
index 7d30322..98c34af 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-fixed-dataformat.adoc
@@ -3,8 +3,8 @@
 
 *Available as of Camel version 2.15*
 
-This xref:manual::data-format.adoc[Data
-Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
+This xref:manual::data-format.adoc[Data
+Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
 * CSV (Comma Separated Values), where the values are separated by a
@@ -169,18 +169,18 @@ Any other body will throws an exception.
 
 == Unmarshalling usages
 
-The unmarshalling uses an `InputStream` in order to read the data.
+The unmarshalling uses an `InputStream` in order to read the data.
 
 Each row produces either:
 
-* a list with all the values in it (`asMap` option with `false`);
+* a list with all the values in it (`asMap` option with `false`);
 * A map with all the values indexed by the
-headers (`asMap` option with `true`).
+headers (`asMap` option with `true`).
 
 All the rows can either:
 
-* be collected at once into a list (`lazyLoad` option with `false`);
-* be read on the fly using an iterator (`lazyLoad` option with `true`).
+* be collected at once into a list (`lazyLoad` option with `false`);
+* be read on the fly using an iterator (`lazyLoad` option with `true`).
 
 === Usage example: unmarshalling a CSV format into maps with automatic headers
 
diff --git a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
index 5f247c4..94f8368 100644
--- a/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
+++ b/components/camel-univocity-parsers/src/main/docs/univocity-tsv-dataformat.adoc
@@ -3,8 +3,8 @@
 
 *Available as of Camel version 2.15*
 
-This xref:manual::data-format.adoc[Data
-Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
+This xref:manual::data-format.adoc[Data
+Format] uses http://www.univocity.com/pages/about-parsers[uniVocity-parsers]
 for reading and writing 3 kinds of tabular data text files:
 
 * CSV (Comma Separated Values), where the values are separated by a
@@ -165,18 +165,18 @@ Any other body will throws an exception.
 
 == Unmarshalling usages
 
-The unmarshalling uses an `InputStream` in order to read the data.
+The unmarshalling uses an `InputStream` in order to read the data.
 
 Each row produces either:
 
-* a list with all the values in it (`asMap` option with `false`);
+* a list with all the values in it (`asMap` option with `false`);
 * A map with all the values indexed by the
-headers (`asMap` option with `true`).
+headers (`asMap` option with `true`).
 
 All the rows can either:
 
-* be collected at once into a list (`lazyLoad` option with `false`);
-* be read on the fly using an iterator (`lazyLoad` option with `true`).
+* be collected at once into a list (`lazyLoad` option with `false`);
+* be read on the fly using an iterator (`lazyLoad` option with `true`).
 
 === Usage example: unmarshalling a CSV format into maps with automatic headers
 
diff --git a/components/camel-validator/src/main/docs/validator-component.adoc b/components/camel-validator/src/main/docs/validator-component.adoc
index 16a6264..1769517 100644
--- a/components/camel-validator/src/main/docs/validator-component.adoc
+++ b/components/camel-validator/src/main/docs/validator-component.adoc
@@ -136,6 +136,6 @@ supplied on the classpath).
 
 You can force that the cached schema in the
 validator endpoint is cleared and reread with the next process call with
-the JMX operation `clearCachedSchema`. You can also use this method to
+the JMX operation `clearCachedSchema`. You can also use this method to
 programmatically clear the cache. This method is available on the
 `ValidatorEndpoint` class.
diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc b/components/camel-velocity/src/main/docs/velocity-component.adoc
index abb1426..724db15 100644
--- a/components/camel-velocity/src/main/docs/velocity-component.adoc
+++ b/components/camel-velocity/src/main/docs/velocity-component.adoc
@@ -182,7 +182,7 @@ Camel will provide exchange information in the Velocity context (just a
 |=======================================================================
 
 You can setup a custom Velocity Context yourself by
-setting the message header *CamelVelocityContext *just like this
+setting the message header *CamelVelocityContext *just like this
 
 [source,java]
 -----------------------------------------------------------------------
@@ -190,7 +190,7 @@ setting the message header *CamelVelocityContext *just like this
    exchange.getIn().setHeader("CamelVelocityContext", velocityContext);
 -----------------------------------------------------------------------
 
- 
+ 
 
 == Hot reloading
 
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc b/components/camel-weather/src/main/docs/weather-component.adoc
index d30db75..365cfe2 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -36,7 +36,7 @@ weather://<unused name>[?options]
 
 Since the 9th of October, an Api Key is required to access the
 openweather service. This key is passed as parameter to the URI
-definition of the weather endpoint using the appid param !
+definition of the weather endpoint using the appid param !
 
 == Geolocation provider
 
diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc b/components/camel-websocket/src/main/docs/websocket-component.adoc
index 7b5917e..f33decb 100644
--- a/components/camel-websocket/src/main/docs/websocket-component.adoc
+++ b/components/camel-websocket/src/main/docs/websocket-component.adoc
@@ -156,7 +156,7 @@ The component supports 16 options, which are listed below.
 
 
 
- 
+ 
 
 == Message Headers
 
@@ -207,9 +207,9 @@ from("activemq:topic:newsTopic")
 
 The WebSocket component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the Cometd component.
 
 [[Websocket-Programmaticconfigurationofthecomponent]]
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
index 316710c..4a68832 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc
@@ -118,7 +118,7 @@ Elements):
       ...
 
 </[signed element]>
-<other sibling/>* 
+<other sibling/>* 
 <!-- between the signed element and the corresponding signature element, there can be other siblings.
  Signature element is added as last sibling. -->
 <Signature Id="generated_unique_ID">
@@ -142,7 +142,7 @@ Elements):
 </Signature>)+
 ----
 
- 
+ 
 
 == URI Format
 
@@ -157,7 +157,7 @@ xmlsecurity:verify:name[?options]
 
 * With the signer endpoint, you can generate a XML signature for the
 body of the in-message which can be either a XML document or a plain
-text. The enveloped, enveloping, or detached (as of 12.14)  XML
+text. The enveloped, enveloping, or detached (as of 12.14)  XML
 signature(s) will be set to the body of the out-message.
 * With the verifier endpoint, you can validate an enveloped or
 enveloping XML signature or even several detached XML
@@ -525,7 +525,7 @@ signature is for the element `A` which also contains the first signature.
 The example shows that you can sign several elements and that for each
 element a signature is created as sibling. The elements to be signed
 must have an attribute of type ID. The ID type of the attribute must be
-defined in the XML schema (see option `schemaResourceUri`). You
+defined in the XML schema (see option `schemaResourceUri`). You
 specify a list of XPATH expressions pointing to attributes of type ID
 (see option `xpathsToIdAttributes`). These attributes determine the
 elements to be signed. The elements are signed by the same key given by
@@ -547,7 +547,7 @@ from("direct:detached")
 
 [source,xml]
 ----
-   
+   
 <bean id="xpathsToIdAttributesBean" class="java.util.ArrayList">
       <constructor-arg type="java.util.Collection">
           <list>
@@ -577,7 +577,7 @@ from("direct:detached")
 
 == XAdES-BES/EPES for the Signer Endpoint
 
-*Available as of Camel 2.15.0* 
+*Available as of Camel 2.15.0* 
 
 http://www.etsi.org/deliver/etsi_ts/101900_101999/101903/01.04.02_60/ts_101903v010402p.pdf[XML
 Advanced Electronic Signatures (XAdES)] defines extensions to XML
@@ -590,7 +590,7 @@ signatures]. XAdES defines different sets of signature properties which
 are called signature forms. We support the signature forms *Basic
 Electronic Signature* (XAdES-BES) and *Explicit Policy Based Electronic
 Signature* (XAdES-EPES) for the Signer Endpoint. The forms
-**Electronic ****Signature with Validation Data** XAdES-T and XAdES-C
+**Electronic ****Signature with Validation Data** XAdES-T and XAdES-C
 are not supported.
 
 
@@ -620,17 +620,17 @@ zero or one occurrence):
 ----
 
 The properties of the XAdES-BES form are the same except that
-the `SignaturePolicyIdentifier` property is not part of XAdES-BES. 
+the `SignaturePolicyIdentifier` property is not part of XAdES-BES. 
 
 You can configure the XAdES-BES/EPES properties via the
-bean `org.apache.camel.component.xmlsecurity.api.XAdESSignatureProperties`
-or `org.apache.camel.component.xmlsecurity.api.DefaultXAdESSignatureProperties. XAdESSignatureProperties` does
+bean `org.apache.camel.component.xmlsecurity.api.XAdESSignatureProperties`
+or `org.apache.camel.component.xmlsecurity.api.DefaultXAdESSignatureProperties. XAdESSignatureProperties` does
 support all properties mentioned above except
-the `SigningCertificate` property. To get
-the `SigningCertificate` property, you must overwrite either the
-method `XAdESSignatureProperties.getSigningCertificate()` or `XAdESSignatureProperties.getSigningCertificateChain()`. The
-class `DefaultXAdESSignatureProperties` overwrites the
-method `getSigningCertificate()` and allows you to specify the signing
+the `SigningCertificate` property. To get
+the `SigningCertificate` property, you must overwrite either the
+method `XAdESSignatureProperties.getSigningCertificate()` or `XAdESSignatureProperties.getSigningCertificateChain()`. The
+class `DefaultXAdESSignatureProperties` overwrites the
+method `getSigningCertificate()` and allows you to specify the signing
 certificate via a keystore and alias. The following example shows all
 parameters you can specify. If you do not need certain parameters you
 can just omit them.
@@ -639,25 +639,25 @@ can just omit them.
 
 [source,java]
 ----
- Keystore keystore = ... // load a keystore
+ Keystore keystore = ... // load a keystore
 DefaultKeyAccessor accessor = new DefaultKeyAccessor();
 accessor.setKeyStore(keystore);
 accessor.setPassword("password");
 accessor.setAlias("cert_alias"); // signer key alias
- 
+ 
 DefaultXAdESSignatureProperties props = new DefaultXAdESSignatureProperties();
 props.setNamespace("http://uri.etsi.org/01903/v1.3.2#"); // sets the namespace for the XAdES elements; the namspace is related to the XAdES version, default value is "http://uri.etsi.org/01903/v1.3.2#", other possible values are "http://uri.etsi.org/01903/v1.1.1#" and "http://uri.etsi.org/01903/v1.2.2#"
 props.setPrefix("etsi"); // sets the prefix for the XAdES elements, default value is "etsi"
- 
+ 
 // signing certificate
 props.setKeystore(keystore));
 props.setAlias("cert_alias"); // specify the alias of the signing certificate in the keystore = signer key alias
 props.setDigestAlgorithmForSigningCertificate(DigestMethod.SHA256); // possible values for the algorithm are "http://www.w3.org/2000/09/xmldsig#sha1", "http://www.w3.org/2001/04/xmlenc#sha256", "http://www.w3.org/2001/04/xmldsig-more#sha384", "http://www.w3.org/2001/04/xmlenc#sha512", default value is "http://www.w3.org/2001/04/xmlenc#sha256"
 props.setSigningCertificateURIs(Collections.singletonList("http://certuri"));
- 
+ 
 // signing time
 props.setAddSigningTime(true);
- 
+ 
 // policy
 props.setSignaturePolicy(XAdESSignatureProperties.SIG_POLICY_EXPLICIT_ID);
 // also the values XAdESSignatureProperties.SIG_POLICY_NONE ("None"), and XAdESSignatureProperties.SIG_POLICY_IMPLIED ("Implied")are possible, default value is XAdESSignatureProperties.SIG_POLICY_EXPLICIT_ID ("ExplicitId")
@@ -674,20 +674,20 @@ props.setSigPolicyQualifiers(Arrays
             + "</SPUserNotice></SigPolicyQualifier>", "category B" }));
 props.setSigPolicyIdDocumentationReferences(Arrays.asList(new String[] {"http://test.com/policy.doc.ref1.txt",
     "http://test.com/policy.doc.ref2.txt" }));
- 
+ 
 // production place
 props.setSignatureProductionPlaceCity("Munich");
 props.setSignatureProductionPlaceCountryName("Germany");
 props.setSignatureProductionPlacePostalCode("80331");
 props.setSignatureProductionPlaceStateOrProvince("Bavaria");
- 
+ 
 //role
 // you can add claimed roles either by specifying text or an XML fragment with the root element "ClaimedRole"
 props.setSignerClaimedRoles(Arrays.asList(new String[] {"test",
     "<a:ClaimedRole xmlns:a=\"http://uri.etsi.org/01903/v1.3.2#\"><TestRole>TestRole</TestRole></a:ClaimedRole>" }));
 props.setSignerCertifiedRoles(Collections.singletonList(new XAdESEncapsulatedPKIData("Ahixl6upD6av8N7pEvDABhEL6hM=",
     "http://uri.etsi.org/01903/v1.2.2#DER", "IdCertifiedRole")));
- 
+ 
 // data object format
 props.setDataObjectFormatDescription("invoice");
 props.setDataObjectFormatMimeType("text/xml");
@@ -696,7 +696,7 @@ props.setDataObjectFormatIdentifierQualifier("OIDAsURN"); //allowed values are e
 props.setDataObjectFormatIdentifierDescription("identifier desc");
 props.setDataObjectFormatIdentifierDocumentationReferences(Arrays.asList(new String[] {
     "http://test.com/dataobject.format.doc.ref1.txt", "http://test.com/dataobject.format.doc.ref2.txt" }));
- 
+ 
 //commitment
 props.setCommitmentTypeId("urn:oid:1.2.840.113549.1.9.16.6.4");
 props.setCommitmentTypeIdQualifier("OIDAsURN"); //allowed values are empty string, "OIDAsURI", "OIDAsURN"; default value is empty string
@@ -706,10 +706,10 @@ props.setCommitmentTypeIdDocumentationReferences(Arrays.asList(new String[] {"ht
 // you can specify a commitment type qualifier either by simple text or an XML fragment with root element "CommitmentTypeQualifier"
 props.setCommitmentTypeQualifiers(Arrays.asList(new String[] {"commitment qualifier",
     "<c:CommitmentTypeQualifier xmlns:c=\"http://uri.etsi.org/01903/v1.3.2#\"><C>c</C></c:CommitmentTypeQualifier>" }));
- 
+ 
 beanRegistry.bind("xmlSignatureProperties",props);
 beanRegistry.bind("keyAccessorDefault",keyAccessor);
- 
+ 
 // you must reference the properties bean in the "xmlsecurity" URI
 from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefault&properties=#xmlSignatureProperties")
              .to("mock:result");
@@ -727,7 +727,7 @@ from("direct:xades").to("xmlsecurity:sign://xades?keyAccessor=#keyAccessorDefaul
 ...
 <bean id="xadesProperties"
     class="org.apache.camel.component.xmlsecurity.api.XAdESSignatureProperties">
-    <!-- For more properties see the previous Java DSL example. 
+    <!-- For more properties see the previous Java DSL example. 
          If you want to have a signing certificate then use the bean class DefaultXAdESSignatureProperties (see the previous Java DSL example). -->
     <property name="signaturePolicy" value="ExplicitId" />
     <property name="sigPolicyId" value="http://www.test.com/policy.pdf" />
@@ -762,12 +762,12 @@ attribute value of `QualifyingProperties` element
 'Id' attribute value of `SignedDataObjectProperties` element
 
 |CamelXmlSignatureXAdESSignedSignaturePropertiesId |String |for the
-'Id' attribute value of `SignedSignatureProperties` element
+'Id' attribute value of `SignedSignatureProperties` element
 
 |CamelXmlSignatureXAdESDataObjectFormatEncoding |String |for the value
 of the Encoding element of the `DataObjectFormat` element
 
-|CamelXmlSignatureXAdESNamespace |String | overwrites the XAdES
+|CamelXmlSignatureXAdESNamespace |String | overwrites the XAdES
 namespace parameter value
 
 |CamelXmlSignatureXAdESPrefix |String |overwrites the XAdES prefix
@@ -778,19 +778,19 @@ parameter value
 
 * No support for signature form XAdES-T and XAdES-C
 * Only signer part implemented. Verifier part currently not available.
-* No support for the `QualifyingPropertiesReference` element (see
+* No support for the `QualifyingPropertiesReference` element (see
 section 6.3.2 of spec).
 * No support for the `Transforms` element contained in
-the `SignaturePolicyId` element contained in
-the `SignaturePolicyIdentifier element`
+the `SignaturePolicyId` element contained in
+the `SignaturePolicyIdentifier element`
 * No support of the `CounterSignature` element -> no support for
-the `UnsignedProperties` element
+the `UnsignedProperties` element
 * At most one `DataObjectFormat` element. More than one
 `DataObjectFormat` element makes no sense because we have only one data
 object which is signed (this is the incoming message body to the XML
 signer endpoint).
 * At most one `CommitmentTypeIndication` element. More than one
-`CommitmentTypeIndication` element makes no sense  because we have only
+`CommitmentTypeIndication` element makes no sense  because we have only
 one data object which is signed (this is the incoming message body to
 the XML signer endpoint).
 * A `CommitmentTypeIndication` element contains always the
diff --git a/components/camel-xmpp/src/main/docs/xmpp-component.adoc b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
index c8e5a7f..b2b0e8a 100644
--- a/components/camel-xmpp/src/main/docs/xmpp-component.adoc
+++ b/components/camel-xmpp/src/main/docs/xmpp-component.adoc
@@ -201,7 +201,7 @@ from("direct:start").
   to("mock:result");
 ---------------------------------------------------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/components/camel-xslt/src/main/docs/xslt-component.adoc b/components/camel-xslt/src/main/docs/xslt-component.adoc
index 8034466..fd7d3e8 100644
--- a/components/camel-xslt/src/main/docs/xslt-component.adoc
+++ b/components/camel-xslt/src/main/docs/xslt-component.adoc
@@ -246,8 +246,8 @@ You can explicitly specify `file:` or `classpath:` loading. The two loading type
 
 Since Saxon 9.2, writing extension functions has been supplemented by a
 new mechanism, referred to
-as http://www.saxonica.com/html/documentation/extensibility/integratedfunctions[integrated
-extension functions] you can now easily use camel as shown in the below example:
+as http://www.saxonica.com/html/documentation/extensibility/integratedfunctions[integrated
+extension functions] you can now easily use camel as shown in the below example:
 
 [source,java]
 ----
@@ -285,7 +285,7 @@ With Spring XML:
 == Dynamic stylesheets
 
 To provide a dynamic stylesheet at runtime you can define a dynamic URI.
-See xref:manual::faq/how-to-use-a-dynamic-uri-in-to.adoc[How to use a dynamic URI in
+See xref:manual::faq/how-to-use-a-dynamic-uri-in-to.adoc[How to use a dynamic URI in
 to()] for more information.
 
 == Accessing warnings, errors and fatalErrors from XSLT ErrorListener
@@ -294,8 +294,8 @@ to()] for more information.
 
 Any warning/error or fatalError is stored on
 the current Exchange as a property with the
-keys `Exchange.XSLT_ERROR`, `Exchange.XSLT_FATAL_ERROR`,
-or `Exchange.XSLT_WARNING` which allows end users to get hold of any
+keys `Exchange.XSLT_ERROR`, `Exchange.XSLT_FATAL_ERROR`,
+or `Exchange.XSLT_WARNING` which allows end users to get hold of any
 errors happening during transformation.
 
 For example in the stylesheet below, we want to terminate if a staff has
@@ -320,7 +320,7 @@ xsl:message.
 ----
 
 The exception is stored on the Exchange as a warning with the
-key `Exchange.XSLT_WARNING.`
+key `Exchange.XSLT_WARNING.`
 
 == See Also
 
diff --git a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
index 287be2e..c84b95b 100644
--- a/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/json-xstream-dataformat.adoc
@@ -10,10 +10,10 @@ with XML and therefore using JSon with XStream is not as popular as for example
 Jackson is for JSon.
 
 To use XStream in your camel routes you need to add the a dependency
-on *camel-xstream* which implements this data format.
+on *camel-xstream* which implements this data format.
 
 Maven users will need to add the following dependency to their
-`pom.xml` for this component:
+`pom.xml` for this component:
 
 [source,xml]
 ----------------------------------------------------------
diff --git a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
index 50bf624..576a1be 100644
--- a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
@@ -8,10 +8,10 @@ http://x-stream.github.io/[XStream library] to marshal and unmarshal
 Java objects to and from XML.
 
 To use XStream in your camel routes you need to add the a dependency
-on *camel-xstream* which implements this data format.
+on *camel-xstream* which implements this data format.
 
 Maven users will need to add the following dependency to their
-`pom.xml` for this component:
+`pom.xml` for this component:
 
 [source,xml]
 ----------------------------------------------------------
@@ -166,8 +166,8 @@ from("activemq:My.Queue").
 In Camel, one can always use its own processing step in the route to
 filter and block certain XML documents to be routed to the XStream's
 unmarhall step. You can
-set http://x-stream.github.io/security.html[XStream's type
-permissions] to automatically allow or deny the instantiation of certain
+set http://x-stream.github.io/security.html[XStream's type
+permissions] to automatically allow or deny the instantiation of certain
 types.
 
 The default type permissions setting used by Camel denies all types
diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
index 3610c8c..0313c57 100644
--- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
+++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
@@ -138,7 +138,7 @@ once for each exchange.
 
 == Message header
 
-Any of the options can be provided in a message header for producer
+Any of the options can be provided in a message header for producer
 endpoints with *CamelZendesk.* prefix. In principal, parameter names are same as
 the arugument name of each API methods on the original `org.zendesk.client.v2.Zendesk`
  class. However some of them are renamed to the other name to avoid confliction in the
diff --git a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
index 2a480b6..9db5ec6 100644
--- a/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc
@@ -43,8 +43,8 @@ from("direct:start").marshal().gzipDeflater().to("activemq:queue:MY_QUEUE");
 
 == Unmarshal
 
-In this example we unmarshal a gzipped payload from an ActiveMQ queue
-called MY_QUEUE to its original format, and forward it for processing to
+In this example we unmarshal a gzipped payload from an ActiveMQ queue
+called MY_QUEUE to its original format, and forward it for processing to
 the `UnGZippedMessageProcessor`.
 
 [source,java]
diff --git a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
index 8bf2c33..1f7441e 100644
--- a/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
+++ b/components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc
@@ -51,13 +51,13 @@ from("direct:start").marshal().zipDeflater().to("activemq:queue:MY_QUEUE");
 
 == Unmarshal
 
-In this example we unmarshal a zipped payload from an ActiveMQ queue
-called MY_QUEUE to its original format, and forward it for processing to
+In this example we unmarshal a zipped payload from an ActiveMQ queue
+called MY_QUEUE to its original format, and forward it for processing to
 the UnZippedMessageProcessor. Note that the compression Level employed
 during the marshalling should be identical to the one employed during
 unmarshalling to avoid errors.
 
 [source,java]
 ----
-from("activemq:queue:MY_QUEUE").unmarshal().zipDeflater().process(new UnZippedMessageProcessor()); 
+from("activemq:queue:MY_QUEUE").unmarshal().zipDeflater().process(new UnZippedMessageProcessor()); 
 ----
\ No newline at end of file
diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
index b3e4e92..4755cd5 100644
--- a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
+++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
@@ -151,7 +151,7 @@ from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay
 Please note that this aggregation strategy requires eager completion check to work properly.
 
 In this example we aggregate all text files found in the input directory
-into a single Zip file that is stored in the output directory. 
+into a single Zip file that is stored in the output directory. 
 
 [source,java]
 ----
@@ -161,10 +161,10 @@ from("file:input/directory?antInclude=*/.txt")
         .to("file:output/directory");
 ----
 
-The outgoing `CamelFileName` message header is created using
-java.io.File.createTempFile, with the ".zip" suffix. If you want to
+The outgoing `CamelFileName` message header is created using
+java.io.File.createTempFile, with the ".zip" suffix. If you want to
 override this behavior, then you can set the value of
-the `CamelFileName` header explicitly in your route:
+the `CamelFileName` header explicitly in your route:
 
 [source,java]
 ----
diff --git a/components/camel-zipkin/src/main/docs/zipkin.adoc b/components/camel-zipkin/src/main/docs/zipkin.adoc
index aa90cd2..0aa85fd 100644
--- a/components/camel-zipkin/src/main/docs/zipkin.adoc
+++ b/components/camel-zipkin/src/main/docs/zipkin.adoc
@@ -18,15 +18,15 @@ The mapping can be configured using:
 * endpoint url - A Camel endpoint url
 
 For both kinds you can match using wildcards and regular expressions,
-using the rules from Intercept.
+using the rules from Intercept.
 
 To match all Camel messages you can use * in the pattern and configure
 that to the same service name.
 
 If no mapping has been configured, Camel will fallback and use
-endpoint uri's as service names.  +
+endpoint uri's as service names.  +
 However, it's recommended to configure service mappings so you can use
-human-readable names instead of Camel endpoint uris in the names.
+human-readable names instead of Camel endpoint uris in the names.
 
 Camel will auto-configure a span reporter one hasn't been explicitly configured,
 and if the hostname and port to a zipkin collector has been configured as environment variables
@@ -75,14 +75,14 @@ uses the rules from Intercept.
 This is not recommended for production usage, or when having big
 payloads. You can limit the size by configuring the
 xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
-debug log size]. 
+debug log size]. 
 
 |includeMessageBodyStreams |false |Whether to include message bodies that are stream based in the zipkin
 traces. This requires enabling streamcaching on the
 routes or globally on the CamelContext. This is not recommended for production usage, or when having big
 payloads. You can limit the size by configuring the
 xref:manual::faq/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.adoc[max
-debug log size].  
+debug log size].  
 |===
 
 // spring-boot-auto-configure options: START
@@ -138,7 +138,7 @@ zipkin.init(camelContext);
 ----
 
 The configuration above will trace all incoming and outgoing
-messages in Camel routes. 
+messages in Camel routes. 
 
 To use ZipkinTracer in XML, all you need to do is to define scribe and
 zipkin tracer beans. Camel will automatically discover and use them.
@@ -283,12 +283,12 @@ uris.
 [[camel-zipkin-camel-zipin-starter]]
 == camel-zipin-starter
 
-If you are using Spring Boot then you can add
-the `camel-zipkin-starter` dependency, and turn on zipkin by annotating
+If you are using Spring Boot then you can add
+the `camel-zipkin-starter` dependency, and turn on zipkin by annotating
 the main class with `@CamelZipkin`. You can then configure camel-zipkin
-in the `application.properties` file where you can configure the
+in the `application.properties` file where you can configure the
 hostname and port number for the Zipkin Server, and all the other
 options as listed in the options table above.
 
 You can find an example of this in
-the https://github.com/apache/camel/tree/master/examples/camel-example-zipkin[camel-example-zipkin]
+the https://github.com/apache/camel/tree/master/examples/camel-example-zipkin[camel-example-zipkin]
diff --git a/components/readme.adoc b/components/readme.adoc
index 904753f..5377476 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -818,7 +818,7 @@ Number of Components: 296 in 234 JAR artifacts (0 deprecated)
 `stub:name` | 2.10 | The stub component provides a simple way to stub out any physical endpoints while in development or testing.
 
 | link:camel-telegram/src/main/docs/telegram-component.adoc[Telegram] (camel-telegram) +
-`telegram:type/authorizationToken` | 2.18 | The telegram component provides access to the Telegram Bot API.
+`telegram:type` | 2.18 | The telegram component provides access to the Telegram Bot API.
 
 | link:camel-thrift/src/main/docs/thrift-component.adoc[Thrift] (camel-thrift) +
 `thrift:host:port/service` | 2.20 | The Thrift component allows to call and expose remote procedures (RPC) with Apache Thrift data format and serialization mechanism
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-base/src/main/docs/simple-language.adoc
index 242dd30..0c6e3c0 100644
--- a/core/camel-base/src/main/docs/simple-language.adoc
+++ b/core/camel-base/src/main/docs/simple-language.adoc
@@ -751,7 +751,7 @@ from("direct:order")
 ----
 
 You can also convert the body to a given
-type, for example to ensure that it is a String you can do:
+type, for example to ensure that it is a String you can do:
 
 [source,xml]
 ----
@@ -765,7 +765,7 @@ There are a few types which have a shorthand notation, so we can use
 `byte[], String, Integer, Long`. All other types must use their FQN
 name, e.g. `org.w3c.dom.Document`.
 
-It is also possible to lookup a value from a header `Map`:
+It is also possible to lookup a value from a header `Map`:
 
 [source,xml]
 ----
diff --git a/core/camel-base/src/main/docs/tokenize-language.adoc b/core/camel-base/src/main/docs/tokenize-language.adoc
index a167eec..a6e7539 100644
--- a/core/camel-base/src/main/docs/tokenize-language.adoc
+++ b/core/camel-base/src/main/docs/tokenize-language.adoc
@@ -10,9 +10,9 @@ The tokenizer language is intended to tokenize text documents using a
 specified delimiter pattern. It can also be used to tokenize XML
 documents with some limited capability. For a truly XML-aware
 tokenization, the use of the XMLTokenizer
-language is recommended as it offers a faster, more efficient
-tokenization specifically for XML documents. For more details
-see Splitter.
+language is recommended as it offers a faster, more efficient
+tokenization specifically for XML documents. For more details
+see Splitter.
 
 == Tokenize Options
 
diff --git a/core/camel-core/src/main/docs/eips/aggregate-eip.adoc b/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
index 365ed17..f77d40a 100644
--- a/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
@@ -124,7 +124,7 @@ exchange is aggregated to determine if we are complete or not.
 The configured aggregationStrategy can implement the
 Predicate interface and will be used as the completionPredicate if no
 completionPredicate is configured. The configured aggregationStrategy can
-implement `PreCompletionAwareAggregationStrategy` and will be used as
+implement `PreCompletionAwareAggregationStrategy` and will be used as
 the completionPredicate in pre-complete check mode. See further below
 for more details.
 * completionFromBatchConsumer - Special option for
@@ -132,7 +132,7 @@ xref:batch-consumer.adoc[Batch Consumer] which allows you to complete
 when all the messages from the batch has been aggregated.
 * forceCompletionOnStop - Indicates to complete all current
 aggregated exchanges when the context is stopped
-* Using a `AggregateController` - which allows to use an
+* Using a `AggregateController` - which allows to use an
 external source to complete groups or all groups. This can be done using
 Java or JMX API.
 
@@ -150,12 +150,12 @@ aggregator. If not provided Camel will thrown an Exception on startup.
 *available as of Camel 2.16*
 
 There can be use-cases where you want the incoming
-xref:exchange.adoc[Exchange] to determine if the correlation group
+xref:exchange.adoc[Exchange] to determine if the correlation group
 should pre-complete, and then the incoming
-xref:exchange.adoc[Exchange] is starting a new group from scratch. To
-determine this the `AggregationStrategy` can
-implement `PreCompletionAwareAggregationStrategy` which has
-a `preComplete` method:
+xref:exchange.adoc[Exchange] is starting a new group from scratch. To
+determine this the `AggregationStrategy` can
+implement `PreCompletionAwareAggregationStrategy` which has
+a `preComplete` method:
 
 [source,java]
 ----
@@ -178,7 +178,7 @@ known as pre-completion mode. And when the aggregation is in
 pre-completion mode, then only the following completions are in use
 
 * aggregationStrategy must
-implement `PreCompletionAwareAggregationStrategy` xxx
+implement `PreCompletionAwareAggregationStrategy` xxx
 * completionTimeout or completionInterval can also be used as fallback
 completions
 * any other completion are not used (such as by size, from batch
@@ -218,14 +218,14 @@ resources, or additional work on the exchange as it's now completed. +
 
 *Available as of Camel 2.15*
 
-The `AggregationStrategy` can now included a property on the
-returned `Exchange` that contains a boolean to indicate if the current
+The `AggregationStrategy` can now included a property on the
+returned `Exchange` that contains a boolean to indicate if the current
 group should be completed. This allows to overrule any existing
 completion predicates / sizes / timeouts etc, and complete the group.
 
 For example the following logic (from an unit test) will complete the
 group if the message body size is larger than 5. This is done by setting
-the property `Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP` to `true`.
+the property `Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP` to `true`.
 
 [source,java]
 ----
@@ -251,8 +251,8 @@ the property `Exchange.AGGREGATION_COMPLETE_CURRENT_GROUP` to `true`.
 
 *Available as of Camel 2.21*
 
-The `AggregationStrategy` can now included a property on the
-returned `Exchange` that contains a boolean to indicate if all previous
+The `AggregationStrategy` can now included a property on the
+returned `Exchange` that contains a boolean to indicate if all previous
 groups should be completed. This allows to overrule any existing
 completion predicates / sizes / timeouts etc, and complete all the existing
 previous group.
@@ -281,7 +281,7 @@ setting the property `Exchange.AGGREGATION_COMPLETE_ALL_GROUPS` to `true`.
     }
 ----
 
- 
+ 
 
 == Manually Force the Completion of All Aggregated Exchanges Immediately
 
@@ -317,13 +317,13 @@ shown below, and implement the `getValue` method:
 
 *Available as of Camel 2.16*
 
-The `org.apache.camel.processor.aggregate.AggregateController` allows
+The `org.apache.camel.processor.aggregate.AggregateController` allows
 you to control the aggregate at runtime using Java or JMX API. This can
 be used to force completing groups of exchanges, or query its current
 runtime statistics.
 
 The aggregator provides a default implementation if no custom have been
-configured, which can be accessed using `getAggregateController()` method.
+configured, which can be accessed using `getAggregateController()` method.
 Though it may be easier to configure a controller in the route using
 `aggregateController` as shown below:
 
@@ -362,7 +362,7 @@ To configure this from XML DSL
 [source,xml]
 ----
 <bean id="myController" class="org.apache.camel.processor.aggregate.DefaultAggregateController"/>
- 
+ 
   <camelContext xmlns="http://camel.apache.org/schema/spring">
         <route>
             <from uri="direct:start"/>
diff --git a/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc b/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
index ede77ff..cfd0aa3 100644
--- a/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
@@ -21,10 +21,10 @@ when a xref:message.adoc[Message] is available for processing.
 
 The following demonstrates a
 http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
-defined in the Camel xref:registry.adoc[Registry] which is
-invoked when an event occurs from a xref:components::jms-component.adoc[JMS] queue.
+defined in the Camel xref:registry.adoc[Registry] which is
+invoked when an event occurs from a xref:components::jms-component.adoc[JMS] queue.
 
-*Using the xref:fluent-builders.adoc[Fluent Builders]*
+*Using the xref:fluent-builders.adoc[Fluent Builders]*
 
 [source,java]
 ----
@@ -32,7 +32,7 @@ from("jms:queue:foo")
     .processRef("processor");
 ----
 
-**Using the xref:spring-xml-extensions.adoc[Spring XML Extensions]**
+**Using the xref:spring-xml-extensions.adoc[Spring XML Extensions]**
 
 [source,xml]
 ----
diff --git a/core/camel-core/src/main/docs/eips/rollback-eip.adoc b/core/camel-core/src/main/docs/eips/rollback-eip.adoc
index 6e0dd26..1b87b95 100644
--- a/core/camel-core/src/main/docs/eips/rollback-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/rollback-eip.adoc
@@ -148,15 +148,15 @@ test].
 
 First of all we setup the usual spring stuff in its configuration file.
 Here we have defined a DataSource to the HSQLDB and a most
-importantly the Spring DataSource TransactionManager that is doing the
+importantly the Spring DataSource TransactionManager that is doing the
 heavy lifting of ensuring our transactional policies. You are of course
-free to use any of the Spring based TransactionManager, eg. if you are
+free to use any of the Spring based TransactionManager, eg. if you are
 in a full blown J2EE container you could use JTA or the WebLogic or
 WebSphere specific managers.
 
 As we use the new convention over configuration we do *not* need to
 configure a transaction policy bean, so we do not have any
-`PROPAGATION_REQUIRED` beans. All the beans needed to be configured is
+`PROPAGATION_REQUIRED` beans. All the beans needed to be configured is
 *standard* Spring beans only, eg. there are no Camel specific
 configuration at
 all.https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml[springTransactionalClientDataSourceMinimalConfiguration]Then
@@ -199,17 +199,17 @@ An Integration Test here means a test runner class annotated
 `@RunWith(SpringJUnit4ClassRunner.class).`
 
 When following the Spring Transactions documentation it is tempting to
-annotate your integration test with `@Transactional` then seed your
+annotate your integration test with `@Transactional` then seed your
 database before firing up the route to be tested and sending a message
 in. This is incorrect as Spring will have an in-progress transaction,
 and Camel will wait on this before proceeding, leading to the route
 timing out.
 
 Instead, remove the `@Transactional` annotation from the test method and
-seed the test data within a `TransactionTemplate` execution which will
+seed the test data within a `TransactionTemplate` execution which will
 ensure the data is committed to the database before Camel attempts to
 pick up and use the transaction manager. A simple
-example https://github.com/rajivj2/example2/blob/master/src/test/java/com/example/NotificationRouterIT.java[can
+example https://github.com/rajivj2/example2/blob/master/src/test/java/com/example/NotificationRouterIT.java[can
 be found on GitHub].
 
 Spring's transactional model ensures each transaction is bound to one
diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc
index 6d4c619..78edffa 100644
--- a/core/camel-core/src/main/docs/eips/toD-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/toD-eip.adoc
@@ -2,10 +2,10 @@
 = To D EIP
 
 There is a new `.toD` / `<toD>` that allows to send a message to a dynamic
-computed xref:endpoint.adoc[Endpoint] using one or
-more xref:expression.adoc[Expression] that are concat together. By
-default the xref:simple-language.adoc[Simple] language is used to compute
-the endpoint.
+computed xref:endpoint.adoc[Endpoint] using one or
+more xref:expression.adoc[Expression] that are concat together. By
+default the xref:simple-language.adoc[Simple] language is used to compute
+the endpoint.
 
 == Options
 
@@ -45,7 +45,7 @@ And in XML:
 ----
 
 You can also prefix the uri with a value because by default the uri is
-evaluated using the xref:simple-language.adoc[Simple] language
+evaluated using the xref:simple-language.adoc[Simple] language
 
 [source,java]
 ----
@@ -67,8 +67,8 @@ In the example above we compute an endpoint that has prefix "mock:" and
 then the header foo is appended. So for example if the header foo has
 value order, then the endpoint is computed as "mock:order".
 
-You can also use other languages than xref:simple-language.adoc[Simple] such
-as xref:components::xpath-language.adoc[XPath] - this requires to prefix with language: as
+You can also use other languages than xref:simple-language.adoc[Simple] such
+as xref:components::xpath-language.adoc[XPath] - this requires to prefix with language: as
 shown below (simple language is the default language). If you do not
 specify language: then the endpoint is a component name. And in some
 cases there is both a component and language with the same name such as
@@ -90,8 +90,8 @@ from("direct:start")
   .toD("language:xpath:/order/@uri");
 ----
 
-You can also concat multiple xref:components::language-component.adoc[Language](s) together
-using the plus sign `+` such as shown below:
+You can also concat multiple xref:components::language-component.adoc[Language](s) together
+using the plus sign `+` such as shown below:
 
 [source,xml]
 ----
@@ -102,7 +102,7 @@ using the plus sign `+` such as shown below:
 ----
 
 In the example above the uri is a combination
-of xref:simple-language.adoc[Simple] language and xref:simple-language.adoc[XPath] where
+of xref:simple-language.adoc[Simple] language and xref:simple-language.adoc[XPath] where
 the first part is simple (simple is default language). And then the plus
 sign separate to another language, where we specify the language name
 followed by a colon
diff --git a/core/camel-core/src/main/docs/eips/wireTap-eip.adoc b/core/camel-core/src/main/docs/eips/wireTap-eip.adoc
index f36fda7..ecf9323 100644
--- a/core/camel-core/src/main/docs/eips/wireTap-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/wireTap-eip.adoc
@@ -60,7 +60,7 @@ the tapped xref:exchange.adoc[Exchange] to be sent in a fire and forget
 style. The tapped xref:exchange.adoc[Exchange] is then sent in a
 separate thread so it can run in parallel with the original. Beware that
 only the Exchange is copied - Wire Tap won't do a deep clone (unless you
-specify a custom processor via *`onPrepareRef`* which does that). So all
+specify a custom processor via *`onPrepareRef`* which does that). So all
 copies could share objects from the original Exchange.
 - Camel also provides an option of sending a new
 xref:exchange.adoc[Exchange] allowing you to populate it with new
@@ -102,7 +102,7 @@ xref:expression.adoc[Expression] to populate the new
 xref:exchange.adoc[Exchange]. Using a processor gives you full power
 over how the xref:exchange.adoc[Exchange] is populated as you can set
 properties, headers, etc. An xref:expression.adoc[Expression] can only
-be used to set the *`IN`* body.
+be used to set the *`IN`* body.
 
 The xref:expression.adoc[Expression] or
 xref:processor.adoc[Processor] is pre-populated with a copy of the
@@ -144,7 +144,7 @@ xref:exchange.adoc[Exchange]
 *Available as of Camel 2.16:*
 
 For example to wire tap to a dynamic URI, then it supports the same
-dynamic URIs as documented in xref:message-endpoint.adoc[Message
+dynamic URIs as documented in xref:message-endpoint.adoc[Message
 Endpoint]. For example to wire tap to a JMS queue where the header ID is
 part of the queue name:
 
@@ -167,8 +167,8 @@ It's possible to set headers as well using the DSL.
 The following example sends a new message which has
 
 * *`Bye World`* as message body.
-* A header with key *`id`* with the value *`123`*.
-* A header with key *`date`* which has current date as value.
+* A header with key *`id`* with the value *`123`*.
+* A header with key *`date`* which has current date as value.
 
 == Java DSL
 
@@ -202,7 +202,7 @@ The following example sends a new message which has
 
 ----
 
-== Using `onPrepare` to Execute Custom Logic when Preparing Messages
+== Using `onPrepare` to Execute Custom Logic when Preparing Messages
 
 *Available as of Camel 2.8*
 
diff --git a/core/camel-jaxp/src/main/docs/xtokenize-language.adoc b/core/camel-jaxp/src/main/docs/xtokenize-language.adoc
index 8f6748a..39df3ca 100644
--- a/core/camel-jaxp/src/main/docs/xtokenize-language.adoc
+++ b/core/camel-jaxp/src/main/docs/xtokenize-language.adoc
@@ -9,7 +9,7 @@ conventional Tokenizer to efficiently and
 effectively tokenize XML documents. XMLTokenizer is capable of not only
 recognizing XML namespaces and hierarchical structures of the document
 but also more efficiently tokenizing XML documents than the conventional
-Tokenizer. 
+Tokenizer. 
 
 For more details see Splitter.
 
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index da940b3..c53f5c6 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -356,9 +356,7 @@
 * xref:twilio-component.adoc[Twilio Component]
 * xref:twitter-directmessage-component.adoc[Twitter Direct Message Component]
 * xref:twitter-search-component.adoc[Twitter Search Component]
-* xref:twitter-streaming-component.adoc[Twitter Streaming Component]
 * xref:twitter-timeline-component.adoc[Twitter Timeline Component]
-* xref:twitter.adoc[Twitter Components ]
 * xref:undertow-component.adoc[Undertow Component]
 * xref:univocity-csv-dataformat.adoc[uniVocity CSV DataFormat]
 * xref:univocity-fixed-dataformat.adoc[uniVocity Fixed Length DataFormat]
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc
index 9cae9c1..93d891f 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -422,9 +422,9 @@ Using the JSSE Configuration Utility
 
 The AHC component supports SSL/TLS configuration
 through the xref:manual::camel-configuration-utilities.adoc[Camel JSSE
-Configuration Utility].  This utility greatly decreases the amount of
+Configuration Utility].  This utility greatly decreases the amount of
 component specific code you need to write and is configurable at the
-endpoint and component levels.  The following examples demonstrate how
+endpoint and component levels.  The following examples demonstrate how
 to use the utility with the AHC component.
 
 [[AHC-Programmaticconfigurationofthecomponent]]
diff --git a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
index 07d6e55..bef029a 100644
--- a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
@@ -3,17 +3,17 @@
 
 *Available as of Camel version 2.14*
 
-The AHC-WS component provides Websocket
-based endpoints for a client communicating with
+The AHC-WS component provides Websocket
+based endpoints for a client communicating with
 external servers over Websocket (as a client opening a websocket
 connection to an external server). +
 The component uses the xref:ahc-component.adoc[AHC] component that in turn uses
-the 
-https://github.com/AsyncHttpClient/async-http-client[Async Http Client] 
+the 
+https://github.com/AsyncHttpClient/async-http-client[Async Http Client] 
 library.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -197,7 +197,7 @@ And the equivalent Spring sample:
 </camelContext>
 ------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index f0c6f43..5a973ef 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -375,7 +375,7 @@ former is almost identical to the latter:
 // Consuming from AMQP queue
 from("amqp:queue:incoming").
   to(...);
- 
+ 
 // Sending message to the AMQP topic
 from(...).
   to("amqp:topic:notify");
@@ -388,13 +388,13 @@ from(...).
 [source,java]
 ----
 AMQPComponent amqp = AMQPComponent.amqpComponent("amqp://localhost:5672");
- 
+ 
 AMQPComponent authorizedAmqp = AMQPComponent.amqpComponent("amqp://localhost:5672", "user", "password");
 ----
 
 You can also add an instance
-of `org.apache.camel.component.amqp.AMQPConnectionDetails` to the
-registry in order to automatically configure the AMQP component. For example for Spring Boot you just have to define bean:
+of `org.apache.camel.component.amqp.AMQPConnectionDetails` to the
+registry in order to automatically configure the AMQP component. For example for Spring Boot you just have to define bean:
 
 *AMQP connection details auto-configuration*
 
@@ -404,7 +404,7 @@ registry in order to automatically configure the AMQP component. For example for
 AMQPConnectionDetails amqpConnection() {
   return new AMQPConnectionDetails("amqp://localhost:5672"); 
 }
- 
+ 
 @Bean
 AMQPConnectionDetails securedAmqpConnection() {
   return new AMQPConnectionDetails("amqp://localhost:5672", "username", "password"); 
@@ -425,7 +425,7 @@ AMQPConnectionDetails amqpConnection() {
 
 You can also rely on the xref:properties-component.adoc[Camel properties] to read
 the AMQP connection details. Factory
-method `AMQPConnectionDetails.discoverAMQP()` attempts to read Camel
+method `AMQPConnectionDetails.discoverAMQP()` attempts to read Camel
 properties in a Kubernetes-like convention, just as demonstrated on the
 snippet below:
 
@@ -437,9 +437,9 @@ export AMQP_SERVICE_HOST = "mybroker.com"
 export AMQP_SERVICE_PORT = "6666"
 export AMQP_SERVICE_USERNAME = "username"
 export AMQP_SERVICE_PASSWORD = "password"
- 
+ 
 ...
- 
+ 
 @Bean
 AMQPConnectionDetails amqpConnection() {
   return AMQPConnectionDetails.discoverAMQP(); 
@@ -459,8 +459,8 @@ For reference take a look at the https://qpid.apache.org/releases/qpid-jms-0.29.
 
 == Using topics
 
-To have using topics working with `camel-amqp` you need to configure the
-component to use `topic://` as topic prefix, as shown below:
+To have using topics working with `camel-amqp` you need to configure the
+component to use `topic://` as topic prefix, as shown below:
 
 [source,java]
 ----
@@ -474,7 +474,7 @@ component to use `topic://` as topic prefix, as shown below:
  </bean>
 ----
 
-Keep in mind that both  `AMQPComponent#amqpComponent()` methods and
+Keep in mind that both  `AMQPComponent#amqpComponent()` methods and
 `AMQPConnectionDetails` pre-configure the component with the topic
 prefix, so you don't have to configure it explicitly.
 
diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc
index 7cbc06d..9506c0c 100644
--- a/docs/components/modules/ROOT/pages/apns-component.adoc
+++ b/docs/components/modules/ROOT/pages/apns-component.adoc
@@ -183,7 +183,7 @@ Camel Apns uses these headers.
 |=======================================================================
 |Property |Default |Description
 |`CamelApnsTokens` | |Empty by default.
-|`CamelApnsMessageType` |`STRING, PAYLOAD, APNS_NOTIFICATION`  |In case you choose PAYLOAD for the message type, then the message will
+|`CamelApnsMessageType` |`STRING, PAYLOAD, APNS_NOTIFICATION`  |In case you choose PAYLOAD for the message type, then the message will
 be considered as a APNS payload and sent as is. In case you choose
 STRING, message will be converted as a APNS payload. From *Camel 2.16*
 onwards APNS_NOTIFICATION is used for sending message body as
@@ -206,7 +206,7 @@ And could be used like as follows:
 [source,java]
 -------------------------------------------------------------------------------------------
 ApnsServiceFactory proxiedApnsServiceFactory = new ApnsServiceFactory(){
-  
+  
   @Override
   protected ApnsServiceBuilder configureServiceBuilder(ApnsServiceBuilder serviceBuilder) {
     return serviceBuilder.withSocksProxy("my.proxy.com", 6666);
diff --git a/docs/components/modules/ROOT/pages/as2-component.adoc b/docs/components/modules/ROOT/pages/as2-component.adoc
index 5083b02..41fe017 100644
--- a/docs/components/modules/ROOT/pages/as2-component.adoc
+++ b/docs/components/modules/ROOT/pages/as2-component.adoc
@@ -184,23 +184,23 @@ as2://client/method?[options]
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
+the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelAS2.option`* header.
+option *`inBody=option`* would override a *`CamelAS2.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of AS2 API errors the endpoint will throw a
 RuntimeCamelException with a
-*org.apache.http.HttpException* derived exception
+*org.apache.http.HttpException* derived exception
 cause.
 
 [width="100%",cols="10%,10%,70%",options="header"]
@@ -210,7 +210,7 @@ cause.
 |send |ediMessage, requestUri, subject, from, as2From, as2To, as2MessageStructure, ediMessageContentType, ediMessageTransferEncoding, dispositionNotificationTo, signedReceiptMicAlgorithms |org.apache.http.protocol.HttpCoreContext
 |===
 
-URI Options for _client_
+URI Options for _client_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -254,23 +254,23 @@ as2://server/method?[options]
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
+the format *`CamelAS2.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelAS2.option`* header.
+option *`inBody=option`* would override a *`CamelAS2.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of AS2 API errors the endpoint will throw a
 RuntimeCamelException with a
-*org.apache.http.HttpException* derived exception
+*org.apache.http.HttpException* derived exception
 cause.
 
 [width="100%",cols="10%,10%,70%",options="header"]
@@ -280,7 +280,7 @@ cause.
 |listen |requestUriPattern |org.apache.http.protocol.HttpCoreContext
 |===
 
-URI Options for _server_
+URI Options for _server_
 
 
 [width="100%",cols="10%,90%",options="header"]
diff --git a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
index f24337d..3789a0c 100644
--- a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
+++ b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
@@ -3,12 +3,12 @@
 
 *Available as of Camel version 2.14*
 
-The Atmosphere-Websocket component provides Websocket
-based endpoints for a servlet communicating with
+The Atmosphere-Websocket component provides Websocket
+based endpoints for a servlet communicating with
 external clients over Websocket (as a servlet accepting websocket
 connections from external clients). +
 The component uses the xref:servlet-component.adoc[SERVLET] component and uses
-the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
+the https://github.com/Atmosphere/atmosphere[Atmosphere] library to
 support the Websocket transport in various Servlet containers (e..g.,
 Jetty, Tomcat, ...).
 
@@ -18,7 +18,7 @@ component that starts the embedded Jetty server, this component uses the
 servlet provider of the container.
 
 Maven users will need to add the following dependency to
-their `pom.xml` for this component:
+their `pom.xml` for this component:
 
 [source,xml]
 ------------------------------------------------------------
@@ -206,7 +206,7 @@ And the equivalent Spring sample:
 </camelContext>
 ------------------------------------------------------------
 
- 
+ 
 
 == See Also
 
diff --git a/docs/components/modules/ROOT/pages/avro-component.adoc b/docs/components/modules/ROOT/pages/avro-component.adoc
index ab06fb9..105da2f 100644
--- a/docs/components/modules/ROOT/pages/avro-component.adoc
+++ b/docs/components/modules/ROOT/pages/avro-component.adoc
@@ -304,11 +304,11 @@ In the example above you need to fill `CamelAvroMessageName` header.
 
 [source,xml]
 -------------------------------------------------------------------------------------------------------------------------------
-        <route>
-            <from uri="direct:start"/>
-            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
-            <to uri="log:avro"/>
-        </route>
+        <route>
+            <from uri="direct:start"/>
+            <to uri="avro:http:localhost:{{avroport}}/put?protocolClassName=org.apache.camel.avro.generated.KeyValueProtocol"/>
+            <to uri="log:avro"/>
+        </route>
 -------------------------------------------------------------------------------------------------------------------------------
 
 An example of consuming messages using camel avro consumers via netty:
diff --git a/docs/components/modules/ROOT/pages/aws-cw-component.adoc b/docs/components/modules/ROOT/pages/aws-cw-component.adoc
index 7f9dd0e..4a8f64e 100644
--- a/docs/components/modules/ROOT/pages/aws-cw-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-cw-component.adoc
@@ -6,7 +6,7 @@
 The CW component allows messages to be sent to an
 https://aws.amazon.com/cloudwatch/[Amazon CloudWatch] metrics. The
 implementation of the Amazon API is provided by
-the https://aws.amazon.com/sdkforjava/[AWS SDK].
+the https://aws.amazon.com/sdkforjava/[AWS SDK].
 
 Prerequisites
 
diff --git a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
index a0d5f43..4681b9f 100644
--- a/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-ddbstream-component.adoc
@@ -4,13 +4,13 @@
 *Available as of Camel version 2.17*
 
 The DynamoDB Stream component supports receiving messages from
-Amazon DynamoDB Stream service.
+Amazon DynamoDB Stream service.
 
 Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon DynamoDB Streams. More information are available
-at https://aws.amazon.com/dynamodb/[AWS DynamoDB]
+at https://aws.amazon.com/dynamodb/[AWS DynamoDB]
 
 == URI Format
 
@@ -153,7 +153,7 @@ The component supports 16 options, which are listed below.
 
 Required DynampDBStream component options
 
-You have to provide the amazonDynamoDbStreamsClient in the
+You have to provide the amazonDynamoDbStreamsClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -177,7 +177,7 @@ aggregate this number of messages.
 
 == Usage
 
-=== AmazonDynamoDBStreamsClient configuration
+=== AmazonDynamoDBStreamsClient configuration
 
 You will need to create an instance of AmazonDynamoDBStreamsClient and
 bind it to the registry
@@ -201,7 +201,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 == Coping with Downtime
@@ -210,7 +210,7 @@ can be specified when calling createClient(...).
 
 The consumer will resume from the last seen sequence number (as
 implemented
-for https://issues.apache.org/jira/browse/CAMEL-9515[CAMEL-9515]), so
+for https://issues.apache.org/jira/browse/CAMEL-9515[CAMEL-9515]), so
 you should receive a flood of events in quick succession, as long as the
 outage did not also include DynamoDB itself.
 
diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
index c1cb1f3..7649f40 100644
--- a/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kinesis-component.adoc
@@ -10,7 +10,7 @@ Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon Kinesis. More information are available
-at https://aws.amazon.com/kinesis/[AWS Kinesis]
+at https://aws.amazon.com/kinesis/[AWS Kinesis]
 
 == URI Format
 
@@ -160,7 +160,7 @@ The component supports 18 options, which are listed below.
 
 Required Kinesis component options
 
-You have to provide the amazonKinesisClient in the
+You have to provide the amazonKinesisClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -220,7 +220,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 === Message headers used by the Kinesis producer to write to Kinesis.  The producer expects that the message body is a `byte[]`.
diff --git a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
index fc3dda6..f81a181 100644
--- a/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-kinesis-firehose-component.adoc
@@ -9,7 +9,7 @@ Prerequisites
 
 You must have a valid Amazon Web Services developer account, and be
 signed up to use Amazon Kinesis Firehose. More information are available
-at https://aws.amazon.com/kinesis/firehose/[AWS Kinesis Firehose]
+at https://aws.amazon.com/kinesis/firehose/[AWS Kinesis Firehose]
 
 == URI Format
 
@@ -131,7 +131,7 @@ The component supports 13 options, which are listed below.
 
 Required Kinesis Firehose component options
 
-You have to provide the amazonKinesisClient in the
+You have to provide the amazonKinesisClient in the
 Registry with proxies and relevant credentials
 configured.
 
@@ -170,7 +170,7 @@ It is recommended that the credentials are obtained by using the
 http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html[DefaultAWSCredentialsProviderChain]
 that is the default when creating a new ClientConfiguration instance,
 however, a
-different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
+different http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/AWSCredentialsProvider.html[AWSCredentialsProvider]
 can be specified when calling createClient(...).
 
 === Message headers set by the Kinesis producer on successful storage of a Record
diff --git a/docs/components/modules/ROOT/pages/aws-sns-component.adoc b/docs/components/modules/ROOT/pages/aws-sns-component.adoc
index 598b72c..479037c 100644
--- a/docs/components/modules/ROOT/pages/aws-sns-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sns-component.adoc
@@ -6,7 +6,7 @@
 The SNS component allows messages to be sent to an
 https://aws.amazon.com/sns[Amazon Simple Notification] Topic. The
 implementation of the Amazon API is provided by
-the https://aws.amazon.com/sdkforjava/[AWS SDK].
+the https://aws.amazon.com/sdkforjava/[AWS SDK].
 
 Prerequisites
 
diff --git a/docs/components/modules/ROOT/pages/aws-swf-component.adoc b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
index 31eb619..7edb1e2 100644
--- a/docs/components/modules/ROOT/pages/aws-swf-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
@@ -168,7 +168,7 @@ The component supports 33 options, which are listed below.
 
 Required SWF component options
 
-You have to provide the amazonSWClient in the
+You have to provide the amazonSWClient in the
 Registry or your accessKey and secretKey to access
 the https://aws.amazon.com/swf[Amazon's Simple Workflow Service].
 
@@ -264,11 +264,11 @@ completed tasks.
 
 === Advanced amazonSWClient configuration
 
-If you need more control over the AmazonSimpleWorkflowClient instance
+If you need more control over the AmazonSimpleWorkflowClient instance
 configuration you can create your own instance and refer to it from the
 URI:
 
-The `#client` refers to a AmazonSimpleWorkflowClient in the
+The `#client` refers to a AmazonSimpleWorkflowClient in the
 Registry.
 
 For example if your Camel Application is running behind a firewall:
diff --git a/docs/components/modules/ROOT/pages/azure.adoc b/docs/components/modules/ROOT/pages/azure.adoc
index bf6b77a..1bb0742 100644
--- a/docs/components/modules/ROOT/pages/azure.adoc
+++ b/docs/components/modules/ROOT/pages/azure.adoc
@@ -4,7 +4,7 @@
 The Camel Components for https://azure.microsoft.com/[Windows Azure Services]
 provide connectivity to Azure services from Camel.
 
- 
+ 
 [width="100%",cols="30%,10%,50%",options="header",]
 |=======================================================================
 |Azure Service |Camel Component |Component Description
diff --git a/docs/components/modules/ROOT/pages/barcode-dataformat.adoc b/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
index 64f8e55..2c2c2da 100644
--- a/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
@@ -158,6 +158,6 @@ the barcode data format as header variable:
 
 |BarcodeFormat |String |Value of com.google.zxing.BarcodeFormat.
 |=======================================================================
- 
+ 
 
- 
+ 
diff --git a/docs/components/modules/ROOT/pages/bean-language.adoc b/docs/components/modules/ROOT/pages/bean-language.adoc
index 5fd1bbc..797a95c 100644
--- a/docs/components/modules/ROOT/pages/bean-language.adoc
+++ b/docs/components/modules/ROOT/pages/bean-language.adoc
@@ -6,7 +6,7 @@
 The purpose of the Bean Language is to be able to implement an
 xref:manual::expression.adoc[Expression] or xref:manual::predicate.adoc[Predicate] using
 a simple method on a bean. The bean name is resolved using a xref:manual::registry.adoc[Registry], such as the
-xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is
+xref:manual::spring.adoc[Spring] *`ApplicationContext`*, then a method is
 invoked to evaluate the xref:manual::expression.adoc[Expression] or
 xref:manual::predicate.adoc[Predicate]. If no method name is provided then one
 is chosen using the rules for xref:manual::bean-binding.adoc[Bean Binding];
@@ -73,7 +73,7 @@ deprecated. Use the *`ref`* attribute instead.
 == Writing the Expression Bean
 
 The bean in the above examples is just any old Java Bean with a method
-called *`isGoldCustomer()`* that returns some object that is easily
+called *`isGoldCustomer()`* that returns some object that is easily
 converted to a *`boolean`* value in this case, as its used as a
 predicate.
 
diff --git a/docs/components/modules/ROOT/pages/bean-validator-component.adoc b/docs/components/modules/ROOT/pages/bean-validator-component.adoc
index 9b41ca3..1a482ae 100644
--- a/docs/components/modules/ROOT/pages/bean-validator-component.adoc
+++ b/docs/components/modules/ROOT/pages/bean-validator-component.adoc
@@ -145,9 +145,9 @@ from("direct:test").
 <bean id="myValidationProviderResolver" class="org.apache.camel.component.bean.validator.HibernateValidationProviderResolver"/> 
 --------------------------------------------------------------------------------------------------------------------------------
 
-If no custom `ValidationProviderResolver` is defined and the validator
+If no custom `ValidationProviderResolver` is defined and the validator
 component has been deployed into the OSGi environment,
-the `HibernateValidationProviderResolver` will be automatically used.
+the `HibernateValidationProviderResolver` will be automatically used.
 
 == Example
 
diff --git a/docs/components/modules/ROOT/pages/beanstalk-component.adoc b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
index 4eeb521..1b8b746 100644
--- a/docs/components/modules/ROOT/pages/beanstalk-component.adoc
+++ b/docs/components/modules/ROOT/pages/beanstalk-component.adoc
@@ -7,7 +7,7 @@ Camel Beanstalk project provides a Camel component for job retrieval and
 post-processing of Beanstalk jobs.
 
 You can find the detailed explanation of Beanstalk job lifecycle
-at http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
+at http://github.com/kr/beanstalkd/blob/v1.3/doc/protocol.txt[Beanstalk
 protocol].
 
 == Dependencies
@@ -32,8 +32,8 @@ where `${camel-version`} must be replaced by the actual version of Camel.
 beanstalk://[host[:port]][/tube][?options]
 ------------------------------------------
 
-You may omit either `port` or both `host` and `port`: for the Beanstalk
-defaults to be used (“localhost” and 11300). If you omit `tube`,
+You may omit either `port` or both `host` and `port`: for the Beanstalk
+defaults to be used (“localhost” and 11300). If you omit `tube`,
 Beanstalk component will use the tube with name “default”.
 
 When listening, you may probably want to watch for jobs from several
@@ -160,33 +160,33 @@ The component supports 4 options, which are listed below.
 
 
 
-Producer behavior is affected by the `command` parameter which tells
+Producer behavior is affected by the `command` parameter which tells
 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 `consumer.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
+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
-of `bury`, `delete` or `release`.
+specifying `consumer.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 `consumer.useBlockIO` which corresponds to
 the same parameter in JavaBeanstalkClient library. By default it
-is `true`.
+is `true`.
 
-Be careful when specifying `release`, as the failed job will immediately
+Be careful when specifying `release`, as the failed job will immediately
 become available in the same tube and your consumer will try to acquire
-it again. You can `release` and specify _jobDelay_ though.
+it again. You can `release` and specify _jobDelay_ though.
 
-The beanstalk consumer is a Scheduled xref:manual::polling-consumer.adoc[Polling
+The beanstalk consumer is a Scheduled xref:manual::polling-consumer.adoc[Polling
 Consumer] which means there is more options you can configure, such as
 how frequent the consumer should poll. For more details
-see Polling Consumer.
+see Polling Consumer.
 
 == Consumer Headers
 
@@ -247,16 +247,16 @@ from("timer:dig?period=30seconds").
 In the first route we are listening for new jobs in tube “testTube”.
 When they are arriving, we are trying to parse integer value from the
 message body. If done successful, we log it and this successful exchange
-completion makes Camel component to _delete_ this job from Beanstalk
+completion makes Camel component to _delete_ this job from Beanstalk
 automatically. Contrary, when we cannot parse the job data, the exchange
-failed and the Camel component _buries_ it by default, so that it can be
+failed and the Camel component _buries_ it by default, so that it can be
 processed later or probably we are going to inspect failed jobs
 manually.
 
-So the second route periodically requests Beanstalk to _kick_ 10 jobs
+So the second route periodically requests Beanstalk to _kick_ 10 jobs
 out of buried and/or delayed state to the normal queue.
 
- 
+ 
 
 == See Also
 
diff --git a/docs/components/modules/ROOT/pages/bindy-dataformat.adoc b/docs/components/modules/ROOT/pages/bindy-dataformat.adoc
index 825bd53..7db66ad 100644
--- a/docs/components/modules/ROOT/pages/bindy-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/bindy-dataformat.adoc
@@ -176,7 +176,7 @@ fields when CSV is generated
 fields when CSV is generated. This annotation is associated to the root class of the model and must be
 declared one time.
 
-|quoting |boolean |optional - default value = false - Indicate if the values (and headers)
+|quoting |boolean |optional - default value = false - Indicate if the values (and headers)
 must be quoted when marshaling when CSV is generated.
 
 |endWithLineBreak |boolean |optional - default value = true - Indicate if the CSV generated file
@@ -484,7 +484,7 @@ default value when the respective CSV field is empty/not available
 |impliedDecimalSeparator |boolean |optional - default value = "false" - Indicates if there is
 a decimal point implied at a specified location
 
-|lengthPos |int |optional - can be used to identify a data field in a
+|lengthPos |int |optional - can be used to identify a data field in a
 fixed-length record that defines the fixed length for this field
 
 |align |string |optional - default value = "R" - Align the text to the right or left within a fixed-length field.
@@ -789,7 +789,7 @@ record
 record
 
 |ignoreTrailingChars |boolean |optional - Indicates that characters beyond the last
-mapped filed can be ignored when unmarshalling / parsing. This annotation is associated to the root class of the model and must be
+mapped filed can be ignored when unmarshalling / parsing. This annotation is associated to the root class of the model and must be
 declared one time.
 |===
 
@@ -1688,7 +1688,7 @@ DataFormat bindy = new BindyCsvDataFormat(com.acme.model.MyModel.class);
 
 === Setting locale
 
-Bindy supports configuring the locale on the dataformat, such as 
+Bindy supports configuring the locale on the dataformat, such as 
 
 [source,java]
 ----
diff --git a/docs/components/modules/ROOT/pages/box-component.adoc b/docs/components/modules/ROOT/pages/box-component.adoc
index 3adc3bc..a534da6 100644
--- a/docs/components/modules/ROOT/pages/box-component.adoc
+++ b/docs/components/modules/ROOT/pages/box-component.adoc
@@ -187,30 +187,30 @@ some endpoints. The endpoint URI MUST contain a prefix.
 Endpoint options that are not mandatory are denoted by *[]*. When there
 are no mandatory options for an endpoint, one of the set of *[]* options
 MUST be provided. Producer endpoints can also use a special
-option *`inBody`* that in turn should contain the name of the endpoint
+option *`inBody`* that in turn should contain the name of the endpoint
 option whose value will be contained in the Camel Exchange In message.
 
 Any of the endpoint options can be provided in either the endpoint URI,
 or dynamically in a message header. The message header name must be of
-the format *`CamelBox.<option>`*. Note that the *`inBody`* option
+the format *`CamelBox.<option>`*. Note that the *`inBody`* option
 overrides message header, i.e. the endpoint
-option *`inBody=option`* would override a *`CamelBox.option`* header.
+option *`inBody=option`* would override a *`CamelBox.option`* header.
 
 If a value is not provided for the option *defaultRequest* either in the
-endpoint URI or in a message header, it will be assumed to be `null`.
-Note that the `null` value will only be used if other options do not
+endpoint URI or in a message header, it will be assumed to be `null`.
+Note that the `null` value will only be used if other options do not
 satisfy matching endpoints.
 
 In case of Box API errors the endpoint will throw a
 RuntimeCamelException with a
-*com.box.sdk.BoxAPIException* derived exception
+*com.box.sdk.BoxAPIException* derived exception
 cause.
 
-=== Endpoint Prefix _collaborations_
+=== Endpoint Prefix _collaborations_
 
 For more information on Box collaborations see
-https://developer.box.com/reference#collaboration-object[https://developer.box.com/reference#collaboration-object]. The
-following endpoints can be invoked with the prefix *`collaborations`* as
+https://developer.box.com/reference#collaboration-object[https://developer.box.com/reference#collaboration-object]. The
+following endpoints can be invoked with the prefix *`collaborations`* as
 follows:
 
 [source]
@@ -237,7 +237,7 @@ box:collaborations/endpoint?[options]
 |updateCollaborationInfo |updateInfo |collaborationId, info |com.box.sdk.BoxCollaboration
 |===
 
-URI Options for _collaborations_
+URI Options for _collaborations_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -257,11 +257,11 @@ URI Options for _collaborations_
 |info |com.box.sdk.BoxCollaboration.Info
 |===
 
-=== Endpoint Prefix _comments_
+=== Endpoint Prefix _comments_
 
 For more information on Box comments see
-https://developer.box.com/reference#comment-object[https://developer.box.com/reference#comment-object]. The
-following endpoints can be invoked with the prefix *`comments`* as
+https://developer.box.com/reference#comment-object[https://developer.box.com/reference#comment-object]. The
+following endpoints can be invoked with the prefix *`comments`* as
 follows:
 
 [source]
@@ -286,7 +286,7 @@ box:comments/endpoint?[options]
 |replyToComment |reply |commentId, message |com.box.sdk.BoxComment
 |===
 
-URI Options for _collaborations_
+URI Options for _collaborations_
 
 
 [width="100%",cols="10%,90%",options="header"]
@@ -301,11 +301,11 @@ URI Options for _collaborations_
 
 |===
 
-=== Endpoint Prefix _events-logs_
+=== Endpoint Prefix _events-logs_
 
 For more information on Box event logs see
 https://developer.box.com/reference#events[https://developer.box.com/reference#events].
-The following endpoints can be invoked with the prefix *`event-logs`* as follows:
+The following endpoints can be invoked with the prefix *`event-logs`* as follows:
 
 [source]
 ----
@@ -319,7 +319,7 @@ box:event-logs/endpoint?[options]
 |getEnterpriseEvents |events |position, after, before, [types] |java.util.List
 |===
 
-URI Options for _event-logs_
+URI Options for _event-logs_
 
 [width="100%",cols="10%,90%",options="header"]
 |===
@@ -334,12 +334,12 @@ URI Options for _event-logs_
 |types |com.box.sdk.BoxEvent.Types[]
 |===
 
-=== Endpoint Prefix _files_
+=== Endpoint Prefix _files_
 
 For more information on Box files see
 https://developer.box.com/reference#file-object[https://developer.box.com/reference#file-object].
 The following endpoints can be invoked with the
-prefix *`files`* as follows. 
+prefix *`files`* as follows. 
 
 [source]
 ----
@@ -459,7 +459,7 @@ URI Options for _files_
 For more information on Box folders see
 https://developer.box.com/reference#folder-object[https://developer.box.com/reference#folder-object].
 The following endpoints can be invoked with the prefix
-*`folders`* as follows. 
+*`folders`* as follows. 
 
 [source]
 ----
@@ -530,11 +530,11 @@ URI Options for _folders_
 |permissions |com.box.sdk.BoxSharedLink.Permissions
 |===
 
-=== Endpoint Prefix _groups_
+=== Endpoint Prefix _groups_
 
 For more information on Box groups see
... 12412 lines suppressed ...