(camel) branch main updated: Update docs

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 95e1dfcd579 Update docs
95e1dfcd579 is described below

commit 95e1dfcd579d180f7d22e6751d8fc72993e10320
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 20 17:30:20 2024 +0100

    Update docs
---
 .../modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc        | 11 +++++++++++
 docs/user-manual/modules/ROOT/pages/camel-catalog.adoc        | 10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc
index afc5faf70c0..e14e89a4946 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc
@@ -266,3 +266,14 @@ The class `BulkRequestAggregationStrategy` has been renamed to `ElasticsearchBul
 
 The class `RedisIdempotentRepository` has been renamed to `SpringRedisIdempotentRepository`
 The class `RedisStringIdempotentRepository` has been renamed to `SpringRedisStringIdempotentRepository`
+
+
+== Camel Spring Boot
+
+The auto configuration with `camel.springboot.xxx` properties has been harmonized to use same naming for
+all the Camel runtimes (camel-main, canel-quarkus, and camel-spring-boot). These options have been marked
+as deprecated, and you can migrate to use `camel.main.xxx` naming instead.
+
+For example `camel.springboot.name = Foo` to `camel.main.name = Foo`.
+
+Only the special Spring Boot options are still named `camel.springboot.xxx`.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-catalog.adoc b/docs/user-manual/modules/ROOT/pages/camel-catalog.adoc
index f08dc3900c3..9dcf71710ff 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-catalog.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-catalog.adoc
@@ -7,12 +7,11 @@ Each release includes a catalog with all sorts of information about what’s inc
 The catalog is shipped in an independent standalone `camel-catalog` JAR containing the following information:
 
 - List of all components, data formats, languages, EIPs, and everything else in the release
-- Curated lists for Camel Quarkus, Camel Spring Boot, and Camel Karaf runtimes
+- Curated lists for Camel Quarkus, Camel Spring Boot, and Camel Main runtimes
 - JSON schema with extensive details for every option
 - Human-readable documentation for every option
 - Categorization of options (for example, find all database components)
 - XML schema for the XML DSLs
-- Maven Archetype Catalog of all the Camel archetypes
 
 There is also a Java API for tooling:
 
@@ -43,14 +42,17 @@ org
 └── apache
   └── camel
     └── catalog
-      ├── archetypes (Maven archetype catalog)
+      ├── beans (JSON schema)
       ├── components (JSON schema)
       ├── dataformats (JSON schema)
+      ├── dev-consoles (JSON schema)
       ├── languages (JSON schema)
       ├── main (JSON schema)
       ├── models (JSON schema)
       ├── others (JSON schema)
-      └── schemas (XML schema)
+      ├── releases (JSON schema)
+      ├── schemas (XML schema)
+      └── transformers (JSON schema)
 ----
 
 Each directory contains files with the information. Every Camel component is included