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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit af28eebb7a5e293fd2fdbffb4ba4c5f121ff10e7
Author: Alexandros Koufoudakis <akoufouda...@gmail.com>
AuthorDate: Thu Jun 20 15:10:22 2019 +0200

    Components "o... - r...". https://issues.apache.org/jira/browse/CAMEL-13480
---
 .../src/main/docs/olingo2-component.adoc           |  2 +-
 .../src/main/docs/olingo4-component.adoc           |  2 +-
 .../src/main/docs/openstack-cinder-component.adoc  |  2 +-
 .../src/main/docs/openstack-glance-component.adoc  |  2 +-
 .../main/docs/openstack-keystone-component.adoc    |  2 +-
 .../src/main/docs/openstack-neutron-component.adoc |  2 +-
 .../src/main/docs/openstack-nova-component.adoc    |  2 +-
 .../src/main/docs/openstack-swift-component.adoc   |  2 +-
 .../camel-openstack/src/main/docs/openstack.adoc   |  2 +-
 .../src/main/docs/opentracing.adoc                 |  9 ++--
 .../src/main/docs/optaplanner-component.adoc       |  4 +-
 .../src/main/docs/paxlogging-component.adoc        |  5 +-
 .../camel-pdf/src/main/docs/pdf-component.adoc     |  2 +-
 .../camel-printer/src/main/docs/lpr-component.adoc |  4 +-
 .../src/main/docs/properties-component.adoc        | 39 ++++++---------
 .../src/main/docs/protobuf-dataformat.adoc         |  2 +-
 .../src/main/docs/pubnub-component.adoc            |  6 +--
 .../src/main/docs/quartz2-component.adoc           |  5 +-
 .../src/main/docs/quickfix-component.adoc          | 17 ++-----
 .../src/main/docs/rabbitmq-component.adoc          | 56 ++--------------------
 .../src/main/docs/reactive-streams-component.adoc  |  2 +-
 .../camel-ref/src/main/docs/ref-component.adoc     |  2 +-
 .../src/main/docs/rest-swagger-component.adoc      |  2 +-
 .../src/main/docs/rest-api-component.adoc          |  2 +-
 .../camel-rest/src/main/docs/rest-component.adoc   |  4 +-
 .../src/main/docs/restlet-component.adoc           | 21 ++++----
 components/camel-ribbon/src/main/docs/ribbon.adoc  |  2 +-
 .../camel-rss/src/main/docs/rss-component.adoc     |  2 +-
 28 files changed, 65 insertions(+), 139 deletions(-)

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 cd3d2a6..36e5e03 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
@@ -209,7 +209,7 @@ org.apache.olingo.odata2.api.commons.HttpStatusCodes for 
other OData resources
 |update |data, resourcePath, endpointHttpHeaders |PUT 
|org.apache.olingo.odata2.api.commons.HttpStatusCodes
 |=======================================================================
 
-### Endpoint HTTP Headers (Since 2.20)
+### Endpoint HTTP Headers
 The component level configuration property **httpHeaders** supplies static 
HTTP header information. 
 However, some systems requires dynamic header information to be passed to and 
received from the endpoint.
 A sample use case would be systems that require dynamic security tokens.  The 
**endpointHttpHeaders** 
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 8d928b9..90e34c1 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
@@ -195,7 +195,7 @@ org.apache.olingo.commons.api.http.HttpStatusCode for other 
OData resources
 |update |data, resourcePath, endpointHttpHeaders |PUT 
|org.apache.olingo.commons.api.http.HttpStatusCode
 |=======================================================================
 
-### Endpoint HTTP Headers (since *Camel 2.20*)
+### Endpoint HTTP Headers
 The component level configuration property **httpHeaders** supplies static 
HTTP header information. 
 However, some systems requires dynamic header information to be passed to and 
received from the endpoint.
 A sample use case would be systems that require dynamic security tokens.  The 
**endpointHttpHeaders** 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
index 517c07e..5900303 100644
--- a/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-cinder-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-cinder component allows messages to be sent to an OpenStack 
block storage services.
+The Openstack Cinder component allows messages to be sent to an OpenStack 
block storage services.
 
 ### Dependencies
 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-glance-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
index 13ab5a1..dc0ea72 100644
--- a/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-glance-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-glance component allows messages to be sent to an OpenStack 
image services.
+The Openstack Glance component allows messages to be sent to an OpenStack 
image services.
 
 ### Dependencies
 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-keystone-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-keystone-component.adoc
index 6e8ed49..cc39608 100644
--- a/components/camel-openstack/src/main/docs/openstack-keystone-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-keystone-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-keystone component allows messages to be sent to an OpenStack 
identity services.
+The Openstack Keystone component allows messages to be sent to an OpenStack 
identity services.
 
 *The openstack-keystone component supports only Identity API v3!*
 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
index 9063461..9af1bbf 100644
--- a/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-neutron-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-neutron component allows messages to be sent to an OpenStack 
network services.
+The Openstack Neutron component allows messages to be sent to an OpenStack 
network services.
 
 ### Dependencies
 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
index ded5dea..53f43ee 100644
--- a/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-nova-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-nova component allows messages to be sent to an OpenStack 
compute services.
+The Openstack Nova component allows messages to be sent to an OpenStack 
compute services.
 
 ### Dependencies
 
diff --git 
a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc 
b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
index 8cf49bf..650c1b9 100644
--- a/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
+++ b/components/camel-openstack/src/main/docs/openstack-swift-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The openstack-swift component allows messages to be sent to an OpenStack 
object storage services.
+The Openstack Swift component allows messages to be sent to an OpenStack 
object storage services.
 
 ### Dependencies
 
diff --git a/components/camel-openstack/src/main/docs/openstack.adoc 
b/components/camel-openstack/src/main/docs/openstack.adoc
index 52cf2ff..3d1c09e 100644
--- a/components/camel-openstack/src/main/docs/openstack.adoc
+++ b/components/camel-openstack/src/main/docs/openstack.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel 2.19*
 
-The *openstack* component is a component for managing your
+The Openstack component is a component for managing your
 https://www.openstack.org//[OpenStack] applications. 
 
 Maven users will need to add the following dependency to their `pom.xml`
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc 
b/components/camel-opentracing/src/main/docs/opentracing.adoc
index ff5ed86..08a7bca 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -3,10 +3,7 @@
 
 *Available as of Camel 2.19*
 
-IMPORTANT: Starting with Camel 2.21, it will be necessary to use an 
OpenTracing complaint tracer that is
-compatible with OpenTracing Java API version 0.31. From Camel 3.0.0.M4, it 
will be necessary to use an OpenTracing compliant tracer that is compatible 
with OpenTracing Java API version 0.32 or higher.
-
-The camel-opentracing component is used for tracing and timing incoming and
+The OpenTracing component is used for tracing and timing incoming and
 outgoing Camel messages using http://opentracing.io/[OpenTracing].
 
 Events (spans) are captured for incoming and outgoing messages being sent
@@ -115,6 +112,10 @@ The OpenTracing Java Agent is associated with the 
following dependency:
     </dependency>
 
---------------------------------------------------------------------------------------------------------
 
+IMPORTANT: It is necessary to use an OpenTracing compliant tracer that is
+compatible with OpenTracing Java API version 0.31 or higher.
+
+
 The `Tracer` used will be implicitly loaded from the camel context `Registry` 
or using the `ServiceLoader`.
 
 How this agent is used will be specific to how you execute your application. 
_Service2_ in the 
https://github.com/apache/camel/tree/master/examples/camel-example-opentracing[camel-example-opentracing]
 downloads the agent into a local folder and then uses the `exec-maven-plugin` 
to launch the service with the `-javaagent` command line option.
diff --git 
a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc 
b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
index bdc7e31..4c86e41 100644
--- a/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
+++ b/components/camel-optaplanner/src/main/docs/optaplanner-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.13*
 
-The *optaplanner:* component solves the planning problem contained in a
+The Optaplanner component solves the planning problem contained in a
 message with http://www.optaplanner.org/[OptaPlanner]. +
  For example: feed it an unsolved Vehicle Routing problem and it solves
 it.
@@ -136,7 +136,7 @@ rather than blocking the current thread.
 ### Message Body
 
 Camel takes the planning problem for the IN body, solves it and returns
-it on the OUT body. (since v 2.16) The IN body object supports the following 
use cases:
+it on the OUT body. The IN body object supports the following use cases:
 
 * If the body is instance of Solution, then it will be solved using the
 solver identified by solverId and either synchronously or
diff --git 
a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc 
b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
index ce136c4..4e48568 100644
--- a/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
+++ b/components/camel-paxlogging/src/main/docs/paxlogging-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.6*
 
-The `paxlogging` component can be used in an OSGi environment to receive
+The PAX Logging component can be used in an OSGi environment to receive
 http://wiki.ops4j.org/display/paxlogging/Pax+Logging[PaxLogging] events
 and process them.
 
@@ -20,8 +20,7 @@ Maven users need to add the following dependency to their 
`pom.xml`
 </dependency>
 -------------------------------------------
 
-where `${camel-version`} must be replaced by the actual version of Camel
-(2.6.0 or higher).
+where `${camel-version`} must be replaced by the actual version of Camel.
 
 ### URI format
 
diff --git a/components/camel-pdf/src/main/docs/pdf-component.adoc 
b/components/camel-pdf/src/main/docs/pdf-component.adoc
index 856e6fc..093a5e3 100644
--- a/components/camel-pdf/src/main/docs/pdf-component.adoc
+++ b/components/camel-pdf/src/main/docs/pdf-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.16*
 
-The *PDF*: components provides the ability to create, modify or extract
+The PDF components provides the ability to create, modify or extract
 content from PDF documents. This component uses
 https://pdfbox.apache.org/[Apache PDFBox] as underlying library to work
 with PDF documents.
diff --git a/components/camel-printer/src/main/docs/lpr-component.adoc 
b/components/camel-printer/src/main/docs/lpr-component.adoc
index 5eddc05..8e44214 100644
--- a/components/camel-printer/src/main/docs/lpr-component.adoc
+++ b/components/camel-printer/src/main/docs/lpr-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.1*
 
-The *printer* component provides a way to direct payloads on a route to
+The Printer component provides a way to direct payloads on a route to
 a printer. Obviously the payload has to be a formatted piece of payload
 in order for the component to appropriately print it. The objective is
 to be able to direct specific payloads as jobs to a line printer in a
@@ -12,7 +12,7 @@ camel flow.
 This component only supports a camel producer endpoint.
 
 The functionality allows for the payload to be printed on a default
-printer, named local, remote or wirelessly linked printer using the
+printer, named local, remote or wireless linked printer using the
 javax printing API under the covers.
 
 Maven users will need to add the following dependency to their `pom.xml`
diff --git 
a/components/camel-properties/src/main/docs/properties-component.adoc 
b/components/camel-properties/src/main/docs/properties-component.adoc
index 4f49367..54b7194 100644
--- a/components/camel-properties/src/main/docs/properties-component.adoc
+++ b/components/camel-properties/src/main/docs/properties-component.adoc
@@ -149,7 +149,7 @@ I use Spring Property Placeholder with Camel XML].
 
 [TIP]
 **Bridging Spring and Camel property placeholders** +
-From Camel 2.10 onwards, you can bridge the Spring property placeholder
+You can bridge the Spring property placeholder
 with Camel, see further below for more details.
 
 The property placeholder is generally in use when doing:
@@ -160,11 +160,11 @@ The property placeholder is generally in use when doing:
 * using Blueprint PropertyPlaceholder with Camel
 <<properties-component,Properties>> component
 * using `@PropertyInject` to inject a property in a POJO
-* *Camel 2.14.1* Using default value if a property does not exists
-* *Camel 2.14.1* Include out of the box functions, to lookup property
+* Using default value if a property does not exists
+* Include out of the box functions, to lookup property
 values from OS environment variables, JVM system properties, or the
 service idiom.
-* *Camel 2.14.1* Using custom functions, which can be plugged into the
+* Using custom functions, which can be plugged into the
 property component.
 
 === Syntax
@@ -175,13 +175,12 @@ example `{{file.uri}}` where `file.uri` is the property 
key.
 You can use property placeholders in parts of the endpoint URI's which
 for example you can use placeholders for parameters in the URIs.
 
-From **Camel 2.14.1** onwards you can specify a default value to use if
+You can specify a default value to use if
 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
-token when you are providing a default value, which is supported from
-*Camel 2.14.1* onwards.
+token when you are providing a default value.
 
 === PropertyResolver
 
@@ -192,11 +191,11 @@ implementation
 is capable of loading properties from the file system, classpath or
 Registry. You can prefix the locations with either:
 
-* `ref:` *Camel 2.4:* to lookup in the Registry
+* `ref:` to lookup in the Registry
 * `file:` to load the from file system
 * `classpath:` to load from classpath (this is also the default if no
 prefix is provided)
-* `blueprint:` *Camel 2.7:* to use a specific OSGi blueprint placeholder
+* `blueprint:` to use a specific OSGi blueprint placeholder
 service
 
 === Defining location
@@ -356,7 +355,7 @@ Setting the properties location through the location tag 
works just fine but som
 
 [TIP]
 **Specifying the cache option inside XML** +
-Camel 2.10 onwards supports specifying a value for the cache option both
+Camel supports specifying a value for the cache option both
 inside the Spring as well as the Blueprint XML.
 
 === Using a Properties from the Registry
@@ -512,7 +511,7 @@ as values which can either be used as override or fallback 
values.
 The default mode is that JVM system properties are in override mode, which 
means they
 are checked first.
 
-And as of Camel 3.0 then OS environment variables are in override mode as 
default mode,
+OS environment variables are in override mode as default mode,
 which means that if a OS environment variable exists, then it will be used.
 
 You can control these modes using the `systemPropertiesMode` and 
`environmentVariableMode`
@@ -559,15 +558,6 @@ assertMockEndpointsSatisfied();
 
 *Available as of Camel 2.7*
 
-NOTE: If you use OSGi Blueprint then this only works from *2.11.1* or *2.10.5*
-onwards.
-
-Previously it was only the `xs:string` type attributes in the XML DSL
-that support placeholders. For example often a timeout attribute would
-be a `xs:int` type and thus you cannot set a string value as the
-placeholder key. This is now possible from Camel 2.7 onwards using a
-special placeholder namespace.
-
 In the example below we use the `prop` prefix for the namespace
 `http://camel.apache.org/schema/placeholder` by which we can use the
 `prop` prefix in the attributes in the XML DSLs. Notice how we use that
@@ -821,8 +811,7 @@ When Testing with Camel and using the
 <<properties-component,Properties>> component, you may want to be able to
 provide the properties to be used from directly within the unit test
 source code. +
-This is now possible from Camel 2.10 onwards, as the Camel test kits, eg
-`CamelTestSupport` class offers the following methods
+Camel test kits, eg `CamelTestSupport` class offers the following methods
 
 * `useOverridePropertiesWithPropertiesComponent`
 * `ignoreMissingLocationWithPropertiesComponent`
@@ -905,10 +894,10 @@ functions out of the box
 properties
 * `service` - A function to lookup the property from OS environment
 variables using the service naming idiom
-* `service.name` - **Camel 2.16.1: **A function to lookup the
+* `service.name` - A function to lookup the
 property from OS environment variables using the service naming idiom
 returning the hostname part only
-* `service.port` - **Camel 2.16.1: **A function to lookup the
+* `service.port` - A function to lookup the
 property from OS environment variables using the service naming idiom
 returning the port part only
 
@@ -1018,7 +1007,7 @@ placeholder. This is best illustrated in the example code 
below
 </camelContext>
 ----
 
-NOTE: from *camel 2.19.0* the location attribute (on propertyPlaceholder tag) 
is not more mandatory
+NOTE: The location attribute (on propertyPlaceholder tag) is not mandatory
 
 Here we have a Camel XML route where we have defined the
 `<propertyPlaceholder>` to use a custom function, which we refer to be the
diff --git a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc 
b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
index 82a672f..765af9e 100644
--- a/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
+++ b/components/camel-protobuf/src/main/docs/protobuf-dataformat.adoc
@@ -67,7 +67,7 @@ The component supports 4 options, which are listed below.
 // spring-boot-auto-configure options: END
 ND
 
-### Content type format (starting from *Camel 2.19*)
+### Content type format
 
 It's possible to parse JSON message to convert it to the protobuf format and 
unparse it back using native util converter.
 To use this option, set contentTypeFormat value to 'json' or call protobuf 
with second parameter.
diff --git a/components/camel-pubnub/src/main/docs/pubnub-component.adoc 
b/components/camel-pubnub/src/main/docs/pubnub-component.adoc
index c7068e6..2327242 100644
--- a/components/camel-pubnub/src/main/docs/pubnub-component.adoc
+++ b/components/camel-pubnub/src/main/docs/pubnub-component.adoc
@@ -6,13 +6,13 @@
 Camel PubNub component can be used to communicate with the 
https://www.pubnub.com/[PubNub] data stream network for connected devices.
 This component uses pubnub https://github.com/pubnub/java[java library].
 
-Use cases includs:
+Use cases include:
 
 ** Chat rooms: Sending and receiving messages
 ** Locations and Connected cars: dispatching taxi cabs
 ** Smart sensors: Receiving data from a sensor for data visualizations
 ** Health: Monitoring heart rate from a patient's wearable device
-** Multiplayer gamings
+** Multiplayer games
 ** Interactive media: audience-participating voting system
 
 
@@ -182,7 +182,7 @@ 
from("pubnub:eon-map-geolocation-output?subscribeKey=mysubkey)
 #### Subscribing to events
 
 The following snippet listens for events on the iot channel.
-If you can add the option withPresens, you will also receive channel Join, 
Leave asf events. 
+If you can add the option withPresence, you will also receive channel Join, 
Leave asf events.
 
 [source,java]
 ----
diff --git a/components/camel-quartz2/src/main/docs/quartz2-component.adoc 
b/components/camel-quartz2/src/main/docs/quartz2-component.adoc
index 375380c..1ab9f23 100644
--- a/components/camel-quartz2/src/main/docs/quartz2-component.adoc
+++ b/components/camel-quartz2/src/main/docs/quartz2-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.12*
 
-The *quartz2:* component provides a scheduled delivery of messages using
+The Quartz2 component provides a scheduled delivery of messages using
 the http://www.quartz-scheduler.org/[Quartz Scheduler 2.x].  +
  Each endpoint represents a different timer (in Quartz terms, a Trigger
 and JobDetail).
@@ -219,8 +219,7 @@ You need to configure the quartz scheduler properties to 
enable JMX. +
 `"org.quartz.scheduler.jmx.export"` to a `true` value in the
 configuration file.
 
-From Camel 2.13 onwards Camel will automatic set this option to true,
-unless explicit disabled.
+This option is set to true by default, unless explicitly disabled.
 
 === Starting the Quartz scheduler
 
diff --git a/components/camel-quickfix/src/main/docs/quickfix-component.adoc 
b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
index 9b74ff1..e06ab62 100644
--- a/components/camel-quickfix/src/main/docs/quickfix-component.adoc
+++ b/components/camel-quickfix/src/main/docs/quickfix-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.1*
 
-The *quickfix* component adapts the
+The Quickfix component adapts the
 http://www.quickfixj.org/[QuickFIX/J] FIX engine for using in Camel .
 This component uses the standard http://www.fixprotocol.org/[Financial
 Interchange (FIX) protocol] for message transport.
@@ -39,7 +39,7 @@ the sessionID is:
 
(BeginString):(SenderCompID)[/(SenderSubID)[/(SenderLocationID)]]->(TargetCompID)[/(TargetSubID)[/(TargetLocationID)]]
 ----
 
-The optional *lazyCreateEngine* (Camel 2.12.3+) parameter allows to
+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
@@ -254,7 +254,7 @@ values in the QuickFIX/J settings file.
 
 |`ScreenLogShowOutgoing` |Use a `ScreenLog`
 
-|`SLF4J*` |**Camel 2.6+**. Use a `SLF4JLog`. Any of the SLF4J settings
+|`SLF4J*` |Use a `SLF4JLog`. Any of the SLF4J settings
 will cause this log to be used.
 
 |`FileLogPath` |Use a `FileLog`
@@ -317,8 +317,6 @@ TargetCompID=YOUR_TARGET
 
 ### Using the InOut Message Exchange Pattern
 
-*Camel 2.8+*
-
 Although the FIX protocol is event-driven and asynchronous, there are
 specific pairs of messages
 that represent a request-reply message exchange. To use an InOut
@@ -392,13 +390,8 @@ response is then converted to a
 JSON-formatted string and sent back to the HTTP server endpoint to be
 provided as the web response.
 
-The Spring configuration have changed from Camel 2.9 onwards. See
-further below for example.
-
 ### Spring Configuration
 
-*Camel 2.6 - 2.8.x*
-
 The QuickFIX/J component includes a Spring `FactoryBean` for configuring
 the session settings within a Spring context. A type converter for
 QuickFIX/J session ID strings is also included. The following example
@@ -457,8 +450,6 @@ default settings for both sessions.
 </bean>
 ----
 
-*Camel 2.9 onwards*
-
 The QuickFIX/J component includes a `QuickfixjConfiguration` class for
 configuring the session settings. A type converter for QuickFIX/J
 session ID strings is also included. The following example shows a
@@ -599,7 +590,7 @@ QuickFix.Message instance.
 
 ### Lazy creating engines
 
-From *Camel 2.12.3* onwards, you can configure the QuickFixComponent to
+You can configure the QuickFixComponent to
 lazy create and start the engines, which then only start these
 on-demand. For example you can use this when you have multiple Camel
 applications in a cluster with master/slaves. And want the slaves to be
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc 
b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index a22a8d2..8176e80 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.12*
 
-The *rabbitmq:* component allows you produce and consume messages from
+The RabbitMQ component allows you produce and consume messages from
 http://www.rabbitmq.com/[RabbitMQ] instances. Using the RabbitMQ AMQP
 client, this component offers a pure RabbitMQ approach over the generic
 http://camel.apache.org/amqp.html[AMQP] component.
@@ -302,7 +302,7 @@ And then refer to the connection factory in the endpoint 
uri as shown below:
 </camelContext>
 ----
 
-From Camel 2.21 onwards the `ConnectionFactory` is auto-detected by default, 
so you can just do
+The `ConnectionFactory` is auto-detected by default, so you can just do
 
 [source,xml]
 ----
@@ -332,7 +332,7 @@ that will be used when producing a message
 
 |`rabbitmq.REDELIVERY_TAG` |Whether the message is a redelivered
 
-|`rabbitmq.REQUEUE` |*Camel 2.14.2:* This is used by the consumer to control 
rejection of the
+|`rabbitmq.REQUEUE` |This is used by the consumer to control rejection of the
 message. When the consumer is complete processing the exchange, and if
 the exchange failed, then the consumer is going to reject the message
 from the RabbitMQ broker. The value of this header controls this
@@ -352,7 +352,7 @@ camel exchange then they will be set on the RabbitMQ 
message.
 
 |`rabbitmq.EXCHANGE_NAME` |The exchange the message was received from
 
-|`rabbitmq.EXCHANGE_OVERRIDE_NAME` | *Camel 2.21:* Used for force sending the 
message to this exchange instead of the endpoint configured name on the producer
+|`rabbitmq.EXCHANGE_OVERRIDE_NAME` |Used for force sending the message to this 
exchange instead of the endpoint configured name on the producer
 
 |`rabbitmq.CONTENT_TYPE` |The contentType to set on the RabbitMQ message
 
@@ -437,51 +437,3 @@ public Map<String, Object> bindArgsBuilder() {
 }
 ----
 
-==== Issue when routing between exchanges (in Camel 2.20.x or older)
-
-If you for example want to route messages from one Rabbit exchange to another 
as shown
-in the example below with foo -> bar:
-
-[source,java]
-----
-from("rabbitmq:foo")
-  .to("rabbitmq:bar")
-----
-
-Then beware that Camel will route the message to itself, eg foo -> foo. So why 
is that?
-This is because the consumer that receives the message (eg from) provides the 
message header
-`rabbitmq.EXCHANGE_NAME` with the name of the exchange, eg `foo`. And when the 
Camel producer
-is sending the message to `bar` then the header `rabbitmq.EXCHANGE_NAME` will 
override this
-and instead send the message to `foo`.
-
-To avoid this you need to either:
-
-- Remove the header:
-
-[source,java]
-----
-from("rabbitmq:foo")
-  .removeHeader("rabbitmq.EXCHANGE_NAME")
-  .to("rabbitmq:bar")
-----
-
-- Or turn on `bridgeEndpoint` mode on the producer:
-
-[source,java]
-----
-from("rabbitmq:foo")
-  .to("rabbitmq:bar?bridgeEndpoint=true")
-----
-
-From Camel 2.21 onwards this has been improved so you can easily route between 
exchanges.
-The header `rabbitmq.EXCHANGE_NAME` is not longer used by the producer to 
override the destination exchange.
-Instead a new header `rabbitmq.EXCHANGE_OVERRIDE_NAME` can be used to send to 
a different exchange.
-For example to send to cheese exchange you can do
-
-[source,java]
-----
-from("rabbitmq:foo")
-  .setHeader("rabbitmq.EXCHANGE_OVERRIDE_NAME", constant("cheese"))
-  .to("rabbitmq:bar")
-----
-
diff --git 
a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
 
b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
index e9e9580..4a4b93b 100644
--- 
a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
+++ 
b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The *reactive-streams:* component allows you to exchange messages with reactive
+The Reactive Streams component allows you to exchange messages with reactive
 stream processing libraries compatible with the
 http://www.reactive-streams.org/[reactive streams] standard.
 
diff --git a/components/camel-ref/src/main/docs/ref-component.adoc 
b/components/camel-ref/src/main/docs/ref-component.adoc
index 8b2f13b..6ababcb 100644
--- a/components/camel-ref/src/main/docs/ref-component.adoc
+++ b/components/camel-ref/src/main/docs/ref-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 1.2*
 
-The *ref:* component is used for lookup of existing endpoints bound in
+The Ref component is used for lookup of existing endpoints bound in
 the Registry.
 
 === URI format
diff --git 
a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc 
b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
index 5d941a4..405cc94 100644
--- a/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
+++ b/components/camel-rest-swagger/src/main/docs/rest-swagger-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.19*
 
-The *rest-swagger* configures rest producers from 
+The REST Swagger* configures rest producers from
 http://swagger.io/[Swagger] (Open API) specification document and
 delegates to a component implementing the _RestProducerFactory_
 interface. Currently known working components are:
diff --git a/components/camel-rest/src/main/docs/rest-api-component.adoc 
b/components/camel-rest/src/main/docs/rest-api-component.adoc
index 256181e..fdb5ec6 100644
--- a/components/camel-rest/src/main/docs/rest-api-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-api-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.16*
 
-The rest-api component is used for providing Swagger API of the REST services 
which has been defined using the rest-dsl in Camel.
+The REST API component is used for providing Swagger API of the REST services 
which has been defined using the rest-dsl in Camel.
 
 === URI Options
 
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc 
b/components/camel-rest/src/main/docs/rest-component.adoc
index 997ca53..f23f5d2 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -3,11 +3,11 @@
 
 *Available as of Camel version 2.14*
 
-The rest component allows to define REST endpoints (consumer) using the
+The REST component allows to define REST endpoints (consumer) using the
 Rest DSL and plugin to other Camel components as the
 REST transport.
 
-From Camel 2.18 onwards the rest component can also be used as a client 
(producer) to call REST services.
+The rest component can also be used as a client (producer) to call REST 
services.
 
 === URI format
 
diff --git a/components/camel-restlet/src/main/docs/restlet-component.adoc 
b/components/camel-restlet/src/main/docs/restlet-component.adoc
index 3fe656b..fe3c48a 100644
--- a/components/camel-restlet/src/main/docs/restlet-component.adoc
+++ b/components/camel-restlet/src/main/docs/restlet-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.0*
 
-The *Restlet* component provides http://www.restlet.org[Restlet] based
+The Restlet component provides http://www.restlet.org[Restlet] based
 endpoints for consuming and producing RESTful
 resources.
 
@@ -48,10 +48,7 @@ NOTE: It seems Restlet is case sensitive in understanding 
headers. For example
 to use content-type, use `Content-Type`, and for location use `Location` and
 so on.
 
-WARNING: We have received a report about drop in performance in camel-restlet 
in
-Camel 2.14.0 and 2.14.1. We have reported this to the Restlet team in
-https://github.com/restlet/restlet-framework-java/issues/996[issue 996].
-To remedy the issue then from Camel 2.14.2 onwards you can set
+To keep up performance you can set
 synchronous=true as option on the endpoint uris, Or set it on the
 RestletComponent as a global option so all endpoints inherit this
 option.
@@ -209,14 +206,12 @@ The component supports 25 options, which are listed below.
 |`Content-Type` |`String` |Specifies the content type, which can be set on the 
OUT message by the
 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. In Camel 2.3 onward, if 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.  
-Otherwise, it is defaulted to "application/x-www-form-urlencoded'. Prior
-to release 2.3, it is not possible to change the request content type
-default.
+Otherwise, it is defaulted to "application/x-www-form-urlencoded'.
 
-|`CamelAcceptContentType` |`String` |*Since Camel 2.9.3, 2.10.0:* The HTTP 
Accept request header.
+|`CamelAcceptContentType` |`String` |The HTTP Accept request header.
 
 |`CamelHttpMethod` |`String` |The HTTP request method. This is set in the IN 
message header.
 
@@ -238,15 +233,15 @@ Camel.
 the application and gets filtered before the restlet request header by
 Camel.
 
-|`CamelRestletRequest` |`Request` |*Camel 2.8:* The `org.restlet.Request` 
object which holds all request
+|`CamelRestletRequest` |`Request` |The `org.restlet.Request` object which 
holds all request
 details.
 
-|`CamelRestletResponse` |`Response` |*Camel 2.8:* The `org.restlet.Response` 
object. You can use this to
+|`CamelRestletResponse` |`Response` |The `org.restlet.Response` object. You 
can use this to
 create responses using the API from Restlet. See examples below.
 
 |`org.restlet.*` |  |Attributes of a Restlet message that get propagated to 
Camel IN headers.
 
-|`cache-control` |`String` or `List<CacheDirective>` |*Camel 2.11:* User can 
set the cache-control with the String value or
+|`cache-control` |`String` or `List<CacheDirective>` |User can set the 
cache-control with the String value or
 the List of CacheDirective of Restlet from the camel message header.
 |===
 
diff --git a/components/camel-ribbon/src/main/docs/ribbon.adoc 
b/components/camel-ribbon/src/main/docs/ribbon.adoc
index 9710a35..5591893 100644
--- a/components/camel-ribbon/src/main/docs/ribbon.adoc
+++ b/components/camel-ribbon/src/main/docs/ribbon.adoc
@@ -2,7 +2,7 @@
 
 *Available as of Camel version 2.18*
 
-The ribbon component provides use of Netflix Ribbon for client side load 
balancing.
+The Ribbon component provides use of Netflix Ribbon for client side load 
balancing.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
diff --git a/components/camel-rss/src/main/docs/rss-component.adoc 
b/components/camel-rss/src/main/docs/rss-component.adoc
index 119e993..14fa8bd 100644
--- a/components/camel-rss/src/main/docs/rss-component.adoc
+++ b/components/camel-rss/src/main/docs/rss-component.adoc
@@ -3,7 +3,7 @@
 
 *Available as of Camel version 2.0*
 
-The *rss:* component is used for polling RSS feeds. Camel will default
+The RSS component is used for polling RSS feeds. Camel will default
 poll the feed every 60th seconds.
 
 Maven users will need to add the following dependency to their `pom.xml`

Reply via email to