You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/10 11:57:14 UTC
[camel] branch master updated: Polished migration guides
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
The following commit(s) were added to refs/heads/master by this push:
new b4551d9 Polished migration guides
b4551d9 is described below
commit b4551d9a48d042bcc0e8ee5e4549bc2a91b1b2b6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 10 12:56:49 2019 +0100
Polished migration guides
---
docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc | 5 ++++-
docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
index 0f39172..e93bf6d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3-migration-guide.adoc
@@ -1,8 +1,11 @@
-= Apache Camel 3 Migration Guide
+= Apache Camel 2.x to 3.0 Migration Guide
This document is intended for helping you migrate your Apache Camel applications
from version 2.x to 3.0.
+IMPORTANT: If you are migrating from Camel 3.x to 3.y then use the
+xref:camel-3x-migration-guide.adoc[Camel 3.x to 3.y Migration Guide].
+
== Java versions
Camel 3 supports Java 11. Support for Java 8 is best effort for the earlier versions of Camel 3. However at some time in the 3.x lifeline we will drop support for Java 8.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
index 45e8639..f075c1f 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
@@ -3,7 +3,7 @@
This document is intended for helping you migrate your Apache Camel application
from Camel 3.x to Camel 3.y.
-IMPORTANT: If you are migrating from Camel 2.x then read first the
+IMPORTANT: If you are migrating from Camel 2.x then use the
xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide].
For example if you are migrating from Camel 3.0 to 3.2, then you should follow the guides