Merge branch 'main' into dependabot/npm_and_yarn/postcss-and-postcss-…

…cli-and-autoprefixer-8.4.31

content/en/users/compute/orchestration/_index.md

@@ -21,8 +21,6 @@ choose (or gets used automatically) in specific scenarios:
 | Service Name                                | Workload Type                | Use-Case                                                                                                                               |
 | ------------------------------------------- | ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
 | [Infrastructure Manager](im)                | VMs, containers, storage     | Used to run workloads on a single IaaS Cloud provider.                                                                                 |
-| [Elastic Cloud Compute Cluster](ec3)        | VMs, containers, storage     | Used when you need to run workloads on clusters that can be elastically scaled and potentially span more than one IaaS Cloud provider. |
 | [Workload Manager](workload-manager)        | Jobs                         | Used to efficiently distribute, manage, and monitor computing workloads.                                                               |
-| [Dynamic On-Demand Analysis Service](dodas) | Containers, storage (caches) | Used when you need to process your data either interactively or via a batch system.                                                    |
 
 The following sections offer more details about each of these orchestrators.

content/en/users/compute/orchestration/ec3/apps/_index.md → content/en/users/compute/orchestration/im/ec3/apps/_index.md

@@ -29,7 +29,7 @@ Check the dedicated [ECAS documentation](./ecas/).
 ### Kubernetes
 
 Check the
-[Cloud Container Compute documentation](../../../cloud-container-compute).
+[Cloud Container Compute documentation](../../../../cloud-container-compute).
 
 ### Mesos + Marathon + Chronos
 

content/en/users/compute/orchestration/ec3/developers/_index.md → content/en/users/compute/orchestration/im/ec3/developers/_index.md

@@ -29,6 +29,6 @@ following process:
 {{% alert title="Note" color="info" %}} For more information please contact
 
 * Miguel Caballer: `micafer1 <at> upv.es`
-* Amanda Calatrav: `amcaar <at> i3m.upv.es`
+* Amanda Calatrava: `amcaar <at> i3m.upv.es`
 
 {{% /alert %}}

content/en/users/data/management/_index.md

@@ -26,37 +26,29 @@ and can be accessed from most [compute services](../../compute).
 
 ## Generic data management
 
-These higher-level data management services are available to researchers:
+This higher-level data management service is available to researchers:
 
-- [EGI Rucio](rucio) is tailored to medium/big scientific collaborations, allowing
-  users to organise, manage, and access their data at scale. Data can be distributed
-  across heterogeneous data centers at widely distributed locations.
 - [EGI DataHub](datahub) is a high-performance data management solution that
   offers unified data access across multiple types of underlying storage, allowing
   users to share, collaborate and easily perform computations on the stored data.
 
 ## Specialized data management
 
-The following specialized data management services are also available:
+The following specialized data management service is also available:
 
 - [EGI Data Transfer](data-transfer) is a low-level service to move data from
   one [Grid](../storage/grid-storage) or [Object](../storage/object-storage) storage
-  to another. It is used internally by [Rucio](rucio) to schedule transfers based
-  on the data policies defined by the users.
-- [openRDM](open-rdm) is a combined [FAIR](https://en.wikipedia.org/wiki/FAIR_data)
-  data management platform, Electronic Laboratory Notebook (ELN) and Inventory Management System
-  allowing a complete overview of workflows and information, from initial data generation
-  to data analysis and publication.
+  to another.
 
-## Use-cases for storing and managing research data
+## Use-cases for storing research data
 
 Depending on the type of the employed compute services and the use-cases being addressed,
 users might need to choose different data service to store, access, and manage data.
 
-| User           | Data storage                                             | Data management (optional) |
-| -------------- | -------------------------------------------------------- | -------------------------- |
-| **Cloud user** | Block and Object storage                                 | DataHub                    |
-| **HTC user**   | Grid storage                                             | Rucio                      |
-| **HPC user**   | High-performance parallel file systems or Object storage | DataHub or Rucio           |
+| User           | Data storage                                             |
+| -------------- | -------------------------------------------------------- |
+| **Cloud user** | Block and Object storage                                 |
+| **HTC user**   | Grid storage                                             |
+| **HPC user**   | High-performance parallel file systems or Object storage |
 
 The following sections offer detailed descriptions for each data management service.