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/08 12:20:25 UTC

[camel] branch master updated: CAMEL-13589: remove references to Wiki

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 330d52b  CAMEL-13589: remove references to Wiki
330d52b is described below

commit 330d52b36479adbe018f00916217490d7657cc28
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Aug 8 13:51:22 2019 +0200

    CAMEL-13589: remove references to Wiki
---
 .../src/main/docs/atmosphere-websocket-component.adoc   |  5 ++---
 .../src/main/docs/braintree-component.adoc              | 16 ++++------------
 .../src/main/docs/cxf-transport.adoc                    |  6 ++++--
 .../src/main/docs/facebook-component.adoc               | 17 +++++------------
 .../camel-jetty/src/main/docs/jetty-component.adoc      |  3 +--
 components/camel-lzf/src/main/docs/lzf-dataformat.adoc  |  8 +++-----
 components/camel-mock/src/main/docs/mock-component.adoc |  4 +---
 .../camel-netty/src/main/docs/netty-component.adoc      |  4 +---
 .../camel-syslog/src/main/docs/syslog-dataformat.adoc   |  1 -
 .../src/main/docs/undertow-component.adoc               |  3 +--
 .../src/main/docs/univocity-csv-dataformat.adoc         |  4 +---
 .../src/main/docs/univocity-fixed-dataformat.adoc       |  4 +---
 .../src/main/docs/univocity-tsv-dataformat.adoc         |  4 +---
 docs/components/modules/ROOT/nav.adoc                   |  2 +-
 .../ROOT/pages/atmosphere-websocket-component.adoc      |  5 ++---
 .../modules/ROOT/pages/braintree-component.adoc         | 16 ++++------------
 docs/components/modules/ROOT/pages/cxf-transport.adoc   |  6 ++++--
 .../modules/ROOT/pages/facebook-component.adoc          | 17 +++++------------
 docs/components/modules/ROOT/pages/jetty-component.adoc |  3 +--
 docs/components/modules/ROOT/pages/lzf-dataformat.adoc  |  8 +++-----
 docs/components/modules/ROOT/pages/mock-component.adoc  |  4 +---
 docs/components/modules/ROOT/pages/netty-component.adoc |  4 +---
 .../modules/ROOT/pages/syslog-dataformat.adoc           |  1 -
 .../modules/ROOT/pages/undertow-component.adoc          |  3 +--
 .../modules/ROOT/pages/univocity-csv-dataformat.adoc    |  4 +---
 .../modules/ROOT/pages/univocity-fixed-dataformat.adoc  |  4 +---
 .../modules/ROOT/pages/univocity-tsv-dataformat.adoc    |  4 +---
 docs/user-manual/modules/ROOT/pages/error-handler.adoc  |  2 --
 ...i-package-applications-using-camel-and-activemq.adoc |  2 +-
 docs/user-manual/modules/ROOT/pages/java-dsl.adoc       |  3 +--
 .../ROOT/pages/walk-through-another-example.adoc        |  4 +---
 31 files changed, 54 insertions(+), 117 deletions(-)

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 8d56b7b..f24337d 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
@@ -13,7 +13,7 @@ support the Websocket transport in various Servlet containers (e..g.,
 Jetty, Tomcat, ...).
 
 Unlike the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+xref:websocket-component.adoc[Websocket]
 component that starts the embedded Jetty server, this component uses the
 servlet provider of the container.
 
@@ -217,5 +217,4 @@ And the equivalent Spring sample:
 
 * xref:servlet-component.adoc[SERVLET]
 * xref:ahc-ws-component.adoc[AHC-WS]
-*
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+* xref:websocket-component.adoc[Websocket]
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc
index b189513..6de3a9d 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -887,15 +887,7 @@ body in the *inBody* endpoint parameter.
 
 == See Also
 
-*
-https://cwiki.apache.org/confluence/display/CAMEL/Configuring+Camel[Configuring
-Camel]
-* https://cwiki.apache.org/confluence/display/CAMEL/Component[Component]
-* https://cwiki.apache.org/confluence/display/CAMEL/Endpoint[Endpoint]
-*
-https://cwiki.apache.org/confluence/display/CAMEL/Getting+Started[Getting
-Started]
-
- 
-
-https://cwiki.apache.org/confluence/display/CAMEL/AMQP[ ]
+* xref:manual::configuring-camel.adoc[Configuring Camel]
+* xref:manual::component.adoc[Component]
+* xref:manual::endpoint.adoc[Endpoint]
+* xref:manual::getting-started.adoc[Getting Started]
diff --git a/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc b/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc
index fa23b53..f0fbdef 100644
--- a/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc
+++ b/components/camel-cxf-transport/src/main/docs/cxf-transport.adoc
@@ -1,5 +1,7 @@
+= CXF Transport Component
+
 [[CamelTransportforCXF-WhatstheCamelTransportforCXF]]
-= What's the Camel Transport for CXF
+== What's the Camel Transport for CXF
 
 In CXF you offer or consume a webservice by defining its address. The
 first part of the address specifies the protocol to use. For example
@@ -12,7 +14,7 @@ to a camel direct endpoint.
 
 Technically speaking Camel transport for CXF is a component which
 implements the
-http://cwiki.apache.org/CXF20DOC/cxf-architecture.html#CXFArchitecture-Transports[CXF
+https://cxf.apache.org/docs/cxf-architecture.html#CXFArchitecture-Transports[CXF
 transport API] with the Camel core library. This allows you to easily
 use Camel's routing engine and integration patterns support together
 with your CXF services.
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index fbefbb4..ea43cc1 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -280,8 +280,7 @@ value in the incoming message body.
 
 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
-*CamelFacebook.https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=option&linkCreation=true&fromPageId=34020899[option]*.
+the format `CamelFacebook.option`.
 For example, the *userId* option value in the previous route could
 alternately be provided in the message header *CamelFacebook.userId*.
 Note that the inBody option overrides message header, e.g. the endpoint
@@ -296,8 +295,7 @@ with a facebook4j.FacebookException cause.
 == Consumer Endpoints:
 
 Any of the producer endpoints that take a
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=reading&linkCreation=true&fromPageId=34020899[reading#reading]
-parameter can be used as a consumer endpoint. The polling consumer uses
+reading parameter can be used as a consumer endpoint. The polling consumer uses
 the *since* and *until* fields to get responses within the polling
 interval. In addition to other reading fields, an initial *since* value
 can be provided in the endpoint for the first poll.
@@ -313,10 +311,7 @@ executed five times (once for each Post).
 The *reading* option of type *facebook4j.Reading* adds support for
 reading parameters, which allow selecting specific fields, limits the
 number of results, etc. For more information see
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=Graph+API&linkCreation=true&fromPageId=34020899[Graph
-API#reading] -
-https://developers.facebook.com/docs/reference/api/#reading[Facebook
-Developers].
+https://developers.facebook.com/docs/reference/api/#reading[Graph API documentation].
 
 It is also used by consumer endpoints to poll Facebook data to avoid
 sending duplicate messages across polls.
@@ -328,10 +323,8 @@ options in either the endpoint URI or exchange header with
 
 == Message header
 
-Any of the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=URI+options&linkCreation=true&fromPageId=34020899[URI
-options#urioptions] can be provided in a message header for producer
-endpoints with *CamelFacebook.* prefix.
+Any of the URI options can be provided in a message header for producer
+endpoints with `CamelFacebook.` prefix.
 
 == Message body
 
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 1095244..81706a7 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -266,8 +266,7 @@ xref:manual::faq/how-do-i-let-jetty-match-wildcards.adoc[How do I let Jetty matc
 
 If you actually want to expose routes by HTTP and already have a
 Servlet, you should instead refer to the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=46339[Servlet
-Transport].
+xref:servlet-component.adoc[Servlet Transport].
 
 Our business logic is implemented in the `MyBookService` class, which
 accesses the HTTP request contents and then returns a response. +
diff --git a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
index aac4840..2811654 100644
--- a/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
+++ b/components/camel-lzf/src/main/docs/lzf-dataformat.adoc
@@ -4,8 +4,8 @@
 *Available as of Camel version 2.17*
 
 The
-LZF https://cwiki.apache.org/confluence/display/CAMEL/Data+Format[Data
-Format] is a message compression and de-compression format. It uses the
+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
 unmarshalled using LZF decompression just prior to being consumed at the
 endpoint. The compression capability is quite useful when you deal with
@@ -84,9 +84,7 @@ To useLZF compression in your camel routes you need to add a dependency
 on *camel-lzf* which implements this data format.
 
 If you use Maven you can just add the following to your `pom.xml`,
-substituting the version number for the latest & greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest & greatest release.
 
 [source,xml]
 ----------------------------------------------------------
diff --git a/components/camel-mock/src/main/docs/mock-component.adoc b/components/camel-mock/src/main/docs/mock-component.adoc
index 409a9e2..72435d1 100644
--- a/components/camel-mock/src/main/docs/mock-component.adoc
+++ b/components/camel-mock/src/main/docs/mock-component.adoc
@@ -377,9 +377,7 @@ in the constructor for the bean:
 Sometimes you want to easily mock and skip sending to a certain
 endpoints. So the message is detoured and send to the mock endpoint
 only. You can now use the `mockEndpointsAndSkip`
-method using AdviceWith or the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=Test+Kit&linkCreation=true&fromPageId=52081[Test
-Kit]. The example below will skip sending to the two endpoints
+method using AdviceWith. The example below will skip sending to the two endpoints
 `"direct:foo"`, and `"direct:bar"`.
 
 [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 2e6b9fa..2559740 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -746,9 +746,7 @@ for Netty consumers, and a
 Netty producers.
 
 Then in the Camel routes we can refer to this worker pools by
-configuring the `workerPool` option in the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=URI&linkCreation=true&fromPageId=45877614[URI]
-as shown below:
+configuring the `workerPool` option in the URI as shown below:
 
 [source,xml]
 ----
diff --git a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
index 17ccb31..c54d06a 100644
--- a/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
+++ b/components/camel-syslog/src/main/docs/syslog-dataformat.adoc
@@ -35,7 +35,6 @@ for this component:
 == RFC3164 Syslog protocol
 
 Syslog uses the user datagram protocol (UDP)
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=1&linkCreation=true&fromPageId=24185759[1]
 as its underlying transport layer mechanism.  
 The UDP port that has been assigned to syslog is 514.
 
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 54cc82e..f50fd68 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -229,6 +229,5 @@ xref:manual::faq/how-do-i-let-jetty-match-wildcards.adoc[How do I let Jetty matc
 
 If you actually want to expose routes by HTTP and already have a
 Servlet, you should instead refer to the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=46339[Servlet
-Transport].
+xref:servlet-component.adoc[Servlet Transport].
 
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 30cd533..f83a553 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
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
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 7c64a0a..7d30322 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
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
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 8634f87..5f247c4 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
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index 2babd1d..da940b3 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -78,7 +78,7 @@
 * xref:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) DataFormat]
 * xref:pgp-dataformat.adoc[PGP DataFormat]
 * xref:csv-dataformat.adoc[CSV DataFormat]
-* xref:cxf-transport.adoc[What's the Camel Transport for CXF]
+* xref:cxf-transport.adoc[CXF Transport Component]
 * xref:cxf-component.adoc[CXF Component]
 * xref:cxfrs-component.adoc[CXF-RS Component]
 * xref:dataformat-component.adoc[Data Format Component]
diff --git a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
index 8d56b7b..f24337d 100644
--- a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
+++ b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
@@ -13,7 +13,7 @@ support the Websocket transport in various Servlet containers (e..g.,
 Jetty, Tomcat, ...).
 
 Unlike the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+xref:websocket-component.adoc[Websocket]
 component that starts the embedded Jetty server, this component uses the
 servlet provider of the container.
 
@@ -217,5 +217,4 @@ And the equivalent Spring sample:
 
 * xref:servlet-component.adoc[SERVLET]
 * xref:ahc-ws-component.adoc[AHC-WS]
-*
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=39621544[Websocket]
+* xref:websocket-component.adoc[Websocket]
diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc b/docs/components/modules/ROOT/pages/braintree-component.adoc
index b189513..6de3a9d 100644
--- a/docs/components/modules/ROOT/pages/braintree-component.adoc
+++ b/docs/components/modules/ROOT/pages/braintree-component.adoc
@@ -887,15 +887,7 @@ body in the *inBody* endpoint parameter.
 
 == See Also
 
-*
-https://cwiki.apache.org/confluence/display/CAMEL/Configuring+Camel[Configuring
-Camel]
-* https://cwiki.apache.org/confluence/display/CAMEL/Component[Component]
-* https://cwiki.apache.org/confluence/display/CAMEL/Endpoint[Endpoint]
-*
-https://cwiki.apache.org/confluence/display/CAMEL/Getting+Started[Getting
-Started]
-
- 
-
-https://cwiki.apache.org/confluence/display/CAMEL/AMQP[ ]
+* xref:manual::configuring-camel.adoc[Configuring Camel]
+* xref:manual::component.adoc[Component]
+* xref:manual::endpoint.adoc[Endpoint]
+* xref:manual::getting-started.adoc[Getting Started]
diff --git a/docs/components/modules/ROOT/pages/cxf-transport.adoc b/docs/components/modules/ROOT/pages/cxf-transport.adoc
index fa23b53..f0fbdef 100644
--- a/docs/components/modules/ROOT/pages/cxf-transport.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-transport.adoc
@@ -1,5 +1,7 @@
+= CXF Transport Component
+
 [[CamelTransportforCXF-WhatstheCamelTransportforCXF]]
-= What's the Camel Transport for CXF
+== What's the Camel Transport for CXF
 
 In CXF you offer or consume a webservice by defining its address. The
 first part of the address specifies the protocol to use. For example
@@ -12,7 +14,7 @@ to a camel direct endpoint.
 
 Technically speaking Camel transport for CXF is a component which
 implements the
-http://cwiki.apache.org/CXF20DOC/cxf-architecture.html#CXFArchitecture-Transports[CXF
+https://cxf.apache.org/docs/cxf-architecture.html#CXFArchitecture-Transports[CXF
 transport API] with the Camel core library. This allows you to easily
 use Camel's routing engine and integration patterns support together
 with your CXF services.
diff --git a/docs/components/modules/ROOT/pages/facebook-component.adoc b/docs/components/modules/ROOT/pages/facebook-component.adoc
index fbefbb4..ea43cc1 100644
--- a/docs/components/modules/ROOT/pages/facebook-component.adoc
+++ b/docs/components/modules/ROOT/pages/facebook-component.adoc
@@ -280,8 +280,7 @@ value in the incoming message body.
 
 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
-*CamelFacebook.https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=option&linkCreation=true&fromPageId=34020899[option]*.
+the format `CamelFacebook.option`.
 For example, the *userId* option value in the previous route could
 alternately be provided in the message header *CamelFacebook.userId*.
 Note that the inBody option overrides message header, e.g. the endpoint
@@ -296,8 +295,7 @@ with a facebook4j.FacebookException cause.
 == Consumer Endpoints:
 
 Any of the producer endpoints that take a
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=reading&linkCreation=true&fromPageId=34020899[reading#reading]
-parameter can be used as a consumer endpoint. The polling consumer uses
+reading parameter can be used as a consumer endpoint. The polling consumer uses
 the *since* and *until* fields to get responses within the polling
 interval. In addition to other reading fields, an initial *since* value
 can be provided in the endpoint for the first poll.
@@ -313,10 +311,7 @@ executed five times (once for each Post).
 The *reading* option of type *facebook4j.Reading* adds support for
 reading parameters, which allow selecting specific fields, limits the
 number of results, etc. For more information see
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=Graph+API&linkCreation=true&fromPageId=34020899[Graph
-API#reading] -
-https://developers.facebook.com/docs/reference/api/#reading[Facebook
-Developers].
+https://developers.facebook.com/docs/reference/api/#reading[Graph API documentation].
 
 It is also used by consumer endpoints to poll Facebook data to avoid
 sending duplicate messages across polls.
@@ -328,10 +323,8 @@ options in either the endpoint URI or exchange header with
 
 == Message header
 
-Any of the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=URI+options&linkCreation=true&fromPageId=34020899[URI
-options#urioptions] can be provided in a message header for producer
-endpoints with *CamelFacebook.* prefix.
+Any of the URI options can be provided in a message header for producer
+endpoints with `CamelFacebook.` prefix.
 
 == Message body
 
diff --git a/docs/components/modules/ROOT/pages/jetty-component.adoc b/docs/components/modules/ROOT/pages/jetty-component.adoc
index 1095244..81706a7 100644
--- a/docs/components/modules/ROOT/pages/jetty-component.adoc
+++ b/docs/components/modules/ROOT/pages/jetty-component.adoc
@@ -266,8 +266,7 @@ xref:manual::faq/how-do-i-let-jetty-match-wildcards.adoc[How do I let Jetty matc
 
 If you actually want to expose routes by HTTP and already have a
 Servlet, you should instead refer to the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=46339[Servlet
-Transport].
+xref:servlet-component.adoc[Servlet Transport].
 
 Our business logic is implemented in the `MyBookService` class, which
 accesses the HTTP request contents and then returns a response. +
diff --git a/docs/components/modules/ROOT/pages/lzf-dataformat.adoc b/docs/components/modules/ROOT/pages/lzf-dataformat.adoc
index aac4840..2811654 100644
--- a/docs/components/modules/ROOT/pages/lzf-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/lzf-dataformat.adoc
@@ -4,8 +4,8 @@
 *Available as of Camel version 2.17*
 
 The
-LZF https://cwiki.apache.org/confluence/display/CAMEL/Data+Format[Data
-Format] is a message compression and de-compression format. It uses the
+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
 unmarshalled using LZF decompression just prior to being consumed at the
 endpoint. The compression capability is quite useful when you deal with
@@ -84,9 +84,7 @@ To useLZF compression in your camel routes you need to add a dependency
 on *camel-lzf* which implements this data format.
 
 If you use Maven you can just add the following to your `pom.xml`,
-substituting the version number for the latest & greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest & greatest release.
 
 [source,xml]
 ----------------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/mock-component.adoc b/docs/components/modules/ROOT/pages/mock-component.adoc
index 409a9e2..72435d1 100644
--- a/docs/components/modules/ROOT/pages/mock-component.adoc
+++ b/docs/components/modules/ROOT/pages/mock-component.adoc
@@ -377,9 +377,7 @@ in the constructor for the bean:
 Sometimes you want to easily mock and skip sending to a certain
 endpoints. So the message is detoured and send to the mock endpoint
 only. You can now use the `mockEndpointsAndSkip`
-method using AdviceWith or the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=Test+Kit&linkCreation=true&fromPageId=52081[Test
-Kit]. The example below will skip sending to the two endpoints
+method using AdviceWith. The example below will skip sending to the two endpoints
 `"direct:foo"`, and `"direct:bar"`.
 
 [source,java]
diff --git a/docs/components/modules/ROOT/pages/netty-component.adoc b/docs/components/modules/ROOT/pages/netty-component.adoc
index 2e6b9fa..2559740 100644
--- a/docs/components/modules/ROOT/pages/netty-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty-component.adoc
@@ -746,9 +746,7 @@ for Netty consumers, and a
 Netty producers.
 
 Then in the Camel routes we can refer to this worker pools by
-configuring the `workerPool` option in the
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=URI&linkCreation=true&fromPageId=45877614[URI]
-as shown below:
+configuring the `workerPool` option in the URI as shown below:
 
 [source,xml]
 ----
diff --git a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
index 17ccb31..c54d06a 100644
--- a/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/syslog-dataformat.adoc
@@ -35,7 +35,6 @@ for this component:
 == RFC3164 Syslog protocol
 
 Syslog uses the user datagram protocol (UDP)
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=1&linkCreation=true&fromPageId=24185759[1]
 as its underlying transport layer mechanism.  
 The UDP port that has been assigned to syslog is 514.
 
diff --git a/docs/components/modules/ROOT/pages/undertow-component.adoc b/docs/components/modules/ROOT/pages/undertow-component.adoc
index 54cc82e..f50fd68 100644
--- a/docs/components/modules/ROOT/pages/undertow-component.adoc
+++ b/docs/components/modules/ROOT/pages/undertow-component.adoc
@@ -229,6 +229,5 @@ xref:manual::faq/how-do-i-let-jetty-match-wildcards.adoc[How do I let Jetty matc
 
 If you actually want to expose routes by HTTP and already have a
 Servlet, you should instead refer to the
-https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=46339[Servlet
-Transport].
+xref:servlet-component.adoc[Servlet Transport].
 
diff --git a/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
index 30cd533..f83a553 100644
--- a/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-csv-dataformat.adoc
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
index 7c64a0a..7d30322 100644
--- a/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-fixed-dataformat.adoc
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
diff --git a/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc b/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
index 8634f87..5f247c4 100644
--- a/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/univocity-tsv-dataformat.adoc
@@ -16,9 +16,7 @@ tabulation
 Thus there are 3 data formats based on uniVocity-parsers.
 
 If you use Maven you can just add the following to your pom.xml,
-substituting the version number for the latest and greatest release
-(see https://cwiki.apache.org/confluence/display/CAMEL/Download[the
-download page for the latest versions]).
+substituting the version number for the latest and greatest release.
 
 [source,xml]
 ----------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/error-handler.adoc b/docs/user-manual/modules/ROOT/pages/error-handler.adoc
index 650be8a..223f7cc 100644
--- a/docs/user-manual/modules/ROOT/pages/error-handler.adoc
+++ b/docs/user-manual/modules/ROOT/pages/error-handler.adoc
@@ -55,7 +55,6 @@ a single RouteBuilder
 [[ErrorHandler-ShortSummaryoftheprovidedErrorHandlers]]
 == Short Summary of the provided Error Handlers
 
-[[ErrorHandler-DefaultErrorHandlerhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=113880]]
 === DefaultErrorHandler
 
 The DefaultErrorHandler is the default
@@ -63,7 +62,6 @@ error handler in Camel. Unlike xref:dead-letter-channel.adoc[Dead Letter
 Channel] it does not have any dead letter queue, and do *not* handle
 exceptions by default.
 
-[[ErrorHandler-DeadLetterChannelhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=49482]]
 === Dead Letter Channel
 
 The Dead Letter Channel will redeliver at
diff --git a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
index f3fef90..08bfac0 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/how-should-i-package-applications-using-camel-and-activemq.adoc
@@ -18,5 +18,5 @@ necessary jars and customise the Spring XML and you're good to go.
 [[HowshouldIpackageapplicationsusingCamelandActiveMQ-WhatjarsdoIneed]]
 == What jars do I need?
 
-* https://cwiki.apache.org/confluence/display/ACTIVEMQ/Initial+Configuration[What jars are required for ActiveMQ]
+* https://activemq.apache.org/initial-configuration.html[What jars are required for ActiveMQ]
 * xref:faq/what-jars-do-i-need.adoc[What jars are required for Camel]
diff --git a/docs/user-manual/modules/ROOT/pages/java-dsl.adoc b/docs/user-manual/modules/ROOT/pages/java-dsl.adoc
index fb8d00e..66cf907 100644
--- a/docs/user-manual/modules/ROOT/pages/java-dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/java-dsl.adoc
@@ -40,8 +40,7 @@ public class MyRouteBuilder extends RouteBuilder {
 -------------------------------------------------------------------------
 
 In the `configure` method we can define Camel Routes.
-In the example above we have a single route, which pickup
-https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAMEL&title=File&linkCreation=true&fromPageId=30747520[File]s,
+In the example above we have a single route, which pickup files,
 (eg the from).
 
 [source,java]
diff --git a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
index 4c6d0dc..160d3ca 100644
--- a/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/walk-through-another-example.adoc
@@ -155,9 +155,7 @@ using TCP
 sendConfirmEmai bean
 
 What to notice here is that the `to` is not the end of the route (the
-world
-image:https://cwiki.apache.org/confluence/s/en_GB/8100/4410012ac87e845516b70bc69b6f7a893eabaa5a/_/images/icons/emoticons/wink.svg[(wink)])
-in this example it's used in the middle of the
+world) in this example it's used in the middle of the
 xref:pipeline-eip.adoc[Pipes and filters]. In fact we can change
 the `bean` types to `to` as well: