This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new bb719c2 Polish and cleanup documentation
bb719c2 is described below
commit bb719c298ae1e666c96363c428da0e1f17a955e7
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Aug 17 13:15:57 2021 +0200
Polish and cleanup documentation
---
camel-core/src/main/docs/eips/publish-subscribe-channel.adoc | 2 +-
camel-core/src/main/docs/eips/unmarshal-eip.adoc | 2 +-
docs/components/modules/ROOT/pages/spring-summary.adoc | 3 +--
docs/components/modules/ROOT/pages/xquery-component.adoc | 3 +--
docs/components/modules/languages/pages/el-language.adoc | 3 +--
docs/components/modules/languages/pages/groovy-language.adoc | 3 +--
docs/components/modules/languages/pages/javaScript-language.adoc | 3 +--
docs/components/modules/languages/pages/jxpath-language.adoc | 3 +--
docs/components/modules/languages/pages/php-language.adoc | 3 +--
docs/components/modules/languages/pages/python-language.adoc | 3 +--
docs/components/modules/languages/pages/ruby-language.adoc | 3 +--
docs/components/modules/languages/pages/sql-language.adoc | 3 +--
docs/components/modules/languages/pages/xquery-language.adoc | 3 +--
docs/components/modules/others/pages/ruby.adoc | 3 +--
14 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
b/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
index aab788d..c7b70ba 100644
--- a/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
+++ b/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
@@ -23,7 +23,7 @@
image:http://www.enterpriseintegrationpatterns.com/img/PublishSubscribeSolution.
Another option is to explicitly list the publish-subscribe relationship
in your routing logic; this keeps the producer and consumer decoupled
but lets you control the fine grained routing configuration using the
-link:dsl.html[DSL] or link:xml-configuration.html[Xml Configuration].
+link:dsl.html[DSL] or XML DSL.
In Java code:
diff --git a/camel-core/src/main/docs/eips/unmarshal-eip.adoc
b/camel-core/src/main/docs/eips/unmarshal-eip.adoc
index 820f4a4..a0c35d0 100644
--- a/camel-core/src/main/docs/eips/unmarshal-eip.adoc
+++ b/camel-core/src/main/docs/eips/unmarshal-eip.adoc
@@ -1,6 +1,6 @@
= Unmarshal EIP
-If you receive a message from one of the Camel
link:https://github.com/apache/camel/tree/master/components[Components] such as
link:https://github.com/apache/camel/blob/master/camel-core/src/main/docs/file-component.adoc[File],
link:https://github.com/apache/camel/blob/master/components/camel-http/src/main/docs/http-component.adoc[HTTP]
or
link:https://github.com/apache/camel/blob/master/components/camel-jms/src/main/docs/jms-component.adoc[JMS]
you often want to unmarshal the payload in [...]
+If you receive a message from one of the Camel
link:https://github.com/apache/camel/tree/master/components[Components] such as
link:https://github.com/apache/camel/blob/master/camel-core/src/main/docs/file-component.adoc[File],
link:https://github.com/apache/camel/blob/master/components/camel-http/src/main/docs/http-component.adoc[HTTP]
or
link:https://github.com/apache/camel/blob/master/components/camel-jms/src/main/docs/jms-component.adoc[JMS]
you often want to unmarshal the payload in [...]
== Options
diff --git a/docs/components/modules/ROOT/pages/spring-summary.adoc
b/docs/components/modules/ROOT/pages/spring-summary.adoc
index b47995a..c570f7d 100644
--- a/docs/components/modules/ROOT/pages/spring-summary.adoc
+++ b/docs/components/modules/ROOT/pages/spring-summary.adoc
@@ -227,8 +227,7 @@ above in the `<packageScan>` documentation.
*Available as of Camel 2.3*
-When defining routes in Camel using
xref:latest@manual::xml-configuration.adoc[Xml
-Configuration] you may want to define some routes in other XML files.
+When defining routes in Camel using XML DSL you may want to define some routes
in other XML files.
For example you may have many routes and it may help to maintain the
application if some of the routes are in separate XML files. You may
also want to store common and reusable routes in other XML files, which
diff --git a/docs/components/modules/ROOT/pages/xquery-component.adoc
b/docs/components/modules/ROOT/pages/xquery-component.adoc
index f21af62..ac28156 100644
--- a/docs/components/modules/ROOT/pages/xquery-component.adoc
+++ b/docs/components/modules/ROOT/pages/xquery-component.adoc
@@ -13,8 +13,7 @@
Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XQuery to create an
+used in the DSL or XML DSL. For example you could use XQuery to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
Recipient List.
diff --git a/docs/components/modules/languages/pages/el-language.adoc
b/docs/components/modules/languages/pages/el-language.adoc
index 2f73ae9..9e67d4b 100644
--- a/docs/components/modules/languages/pages/el-language.adoc
+++ b/docs/components/modules/languages/pages/el-language.adoc
@@ -16,8 +16,7 @@
Camel supports the unified JSP and JSF Expression Language via the
http://juel.sourceforge.net/[JUEL] to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
For example you could use EL inside a
xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] in XML
diff --git a/docs/components/modules/languages/pages/groovy-language.adoc
b/docs/components/modules/languages/pages/groovy-language.adoc
index 5094e2e..5d51518 100644
--- a/docs/components/modules/languages/pages/groovy-language.adoc
+++ b/docs/components/modules/languages/pages/groovy-language.adoc
@@ -13,8 +13,7 @@
Camel supports http://groovy.codehaus.org/[Groovy] among other
Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a Groovy expression use the following Java code
diff --git a/docs/components/modules/languages/pages/javaScript-language.adoc
b/docs/components/modules/languages/pages/javaScript-language.adoc
index 06cfebf..ff0748f 100644
--- a/docs/components/modules/languages/pages/javaScript-language.adoc
+++ b/docs/components/modules/languages/pages/javaScript-language.adoc
@@ -15,8 +15,7 @@ Camel supports
http://en.wikipedia.org/wiki/JavaScript[JavaScript/ECMAScript] among
other Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a JavaScript expression use the following Java code
diff --git a/docs/components/modules/languages/pages/jxpath-language.adoc
b/docs/components/modules/languages/pages/jxpath-language.adoc
index f81f192..4fcadc0 100644
--- a/docs/components/modules/languages/pages/jxpath-language.adoc
+++ b/docs/components/modules/languages/pages/jxpath-language.adoc
@@ -14,8 +14,7 @@
Camel supports http://commons.apache.org/jxpath/[JXPath] to allow
XPath expressions to be used on beans in an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use JXPath to create an
+used in the DSL or XML DSL. For example you could use JXPath to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
Recipient List.
diff --git a/docs/components/modules/languages/pages/php-language.adoc
b/docs/components/modules/languages/pages/php-language.adoc
index c4043fd..2dea356 100644
--- a/docs/components/modules/languages/pages/php-language.adoc
+++ b/docs/components/modules/languages/pages/php-language.adoc
@@ -14,8 +14,7 @@
Camel supports http://www.php.net/[PHP] among other
Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a PHP expression use the following Java code
diff --git a/docs/components/modules/languages/pages/python-language.adoc
b/docs/components/modules/languages/pages/python-language.adoc
index 7f5e2a3..57625a6 100644
--- a/docs/components/modules/languages/pages/python-language.adoc
+++ b/docs/components/modules/languages/pages/python-language.adoc
@@ -14,8 +14,7 @@
Camel supports http://www.python.org/[Python] among other
Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a Python expression use the following Java code
diff --git a/docs/components/modules/languages/pages/ruby-language.adoc
b/docs/components/modules/languages/pages/ruby-language.adoc
index 870a050..dbc1ee9 100644
--- a/docs/components/modules/languages/pages/ruby-language.adoc
+++ b/docs/components/modules/languages/pages/ruby-language.adoc
@@ -14,8 +14,7 @@
Camel supports http://www.ruby-lang.org/en/[Ruby] among other
Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a Ruby expression use the following Java code
diff --git a/docs/components/modules/languages/pages/sql-language.adoc
b/docs/components/modules/languages/pages/sql-language.adoc
index 706fbae..57db2b0 100644
--- a/docs/components/modules/languages/pages/sql-language.adoc
+++ b/docs/components/modules/languages/pages/sql-language.adoc
@@ -42,8 +42,7 @@ the download page for the latest versions).
Camel supports http://en.wikipedia.org/wiki/SQL[SQL] to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use SQL to create an
+used in the DSL or XML DSL. For example you could use SQL to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
Recipient List.
diff --git a/docs/components/modules/languages/pages/xquery-language.adoc
b/docs/components/modules/languages/pages/xquery-language.adoc
index 37f4471..f0a7237 100644
--- a/docs/components/modules/languages/pages/xquery-language.adoc
+++ b/docs/components/modules/languages/pages/xquery-language.adoc
@@ -12,8 +12,7 @@
Camel supports http://www.w3.org/TR/xquery/[XQuery] to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration]. For example you could use XQuery to create an
+used in the DSL or XML DSL. For example you could use XQuery to create an
Predicate in a xref:{eip-vc}:eips:filter-eip.adoc[Message
Filter] or as an Expression for a
Recipient List.
diff --git a/docs/components/modules/others/pages/ruby.adoc
b/docs/components/modules/others/pages/ruby.adoc
index ac6569c..3407a9a 100644
--- a/docs/components/modules/others/pages/ruby.adoc
+++ b/docs/components/modules/others/pages/ruby.adoc
@@ -13,8 +13,7 @@
Camel supports http://www.ruby-lang.org/en/[Ruby] among other
Scripting Languages to allow an
Expression or Predicate to be
-used in the DSL or xref:latest@manual::xml-configuration.adoc[Xml
-Configuration].
+used in the DSL or XML DSL.
To use a Ruby expression use the following Java code
