You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2019/12/11 07:01:40 UTC
[camel] branch master updated: CAMEL-14254: Rename 'Camel 3.x
Migration Guide' -> 'Camel 3.x Upgrade Guide'
This is an automated email from the ASF dual-hosted git repository.
tsato 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 274e1df CAMEL-14254: Rename 'Camel 3.x Migration Guide' -> 'Camel 3.x Upgrade Guide'
274e1df is described below
commit 274e1dfafb665005f876e4ba32e8bdc9c94cfd76
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Wed Dec 11 16:00:42 2019 +0900
CAMEL-14254: Rename 'Camel 3.x Migration Guide' -> 'Camel 3.x Upgrade Guide'
---
docs/user-manual-nav.adoc.template | 2 +-
docs/user-manual/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/camel-3-migration-guide.adoc | 4 ++--
...mel-3x-migration-guide.adoc => camel-3x-upgrade-guide.adoc} | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/user-manual-nav.adoc.template b/docs/user-manual-nav.adoc.template
index 823d200..aa223f1 100644
--- a/docs/user-manual-nav.adoc.template
+++ b/docs/user-manual-nav.adoc.template
@@ -161,4 +161,4 @@
** xref:faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc[Why does Camel use too many threads with ProducerTemplate?]
** xref:faq/why-does-maven-not-download-dependencies.adoc[Why does maven not download dependencies?]
* xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide]
-* xref:camel-3x-migration-guide.adoc[Camel 3.x Migration Guide]
\ No newline at end of file
+* xref:camel-3x-upgrade-guide.adoc[Camel 3.x Upgrade Guide]
diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc
index 65d8e67..82442f4 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -237,4 +237,4 @@
** xref:faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc[Why does Camel use too many threads with ProducerTemplate?]
** xref:faq/why-does-maven-not-download-dependencies.adoc[Why does maven not download dependencies?]
* xref:camel-3-migration-guide.adoc[Camel 2.x to 3.0 Migration Guide]
-* xref:camel-3x-migration-guide.adoc[Camel 3.x Migration Guide]
\ No newline at end of file
+* xref:camel-3x-upgrade-guide.adoc[Camel 3.x Upgrade Guide]
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 e93bf6d..731b39b 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
@@ -3,8 +3,8 @@
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].
+IMPORTANT: If you are upgrading Camel 3.x to 3.y then use the
+xref:camel-3x-upgrade-guide.adoc[Camel 3.x Upgrade Guide].
== Java versions
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
similarity index 78%
rename from docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
rename to docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index f075c1f..fd24dd3 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -1,15 +1,15 @@
-= Apache Camel 3.x Migration Guide
+= Apache Camel 3.x Upgrade Guide
-This document is intended for helping you migrate your Apache Camel application
-from Camel 3.x to Camel 3.y.
+This document is intended for helping you upgrade your Apache Camel application
+from Camel 3.x to 3.y.
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
+For example if you are upgrading Camel 3.0 to 3.2, then you should follow the guides
from both 3.0 to 3.1 and 3.1 to 3.2.
-== Migrating from Camel 3.0 to 3.1
+== Upgrading Camel 3.0 to 3.1
=== camel-nats